From 8fd12c53d2f3d32ec30ec3c51f8959f537d9e6f3 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 20 Nov 2017 14:26:18 +0100 Subject: [PATCH] style renames --- lv_draw/lv_draw.c | 4 +- lv_obj/lv_group.c | 2 +- lv_obj/lv_style.c | 98 ++++++++++++++++++------------------ lv_obj/lv_style.h | 12 ++--- lv_objx/lv_btn.c | 10 ++-- lv_objx/lv_btnm.c | 10 ++-- lv_objx/lv_chart.c | 4 +- lv_objx/lv_gauge.c | 2 +- lv_objx/lv_led.c | 2 +- lv_objx/lv_list.c | 10 ++-- lv_objx/lv_lmeter.c | 2 +- lv_objx/lv_roller.c | 6 +-- lv_objx/lv_ta.c | 2 +- lv_objx/lv_win.c | 4 +- lv_themes/lv_theme_alien.c | 54 ++++++++++---------- lv_themes/lv_theme_default.c | 16 +++--- 16 files changed, 119 insertions(+), 119 deletions(-) diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c index 00cdbfc33..c6b9aa163 100644 --- a/lv_draw/lv_draw.c +++ b/lv_draw/lv_draw.c @@ -593,7 +593,7 @@ static void lv_draw_rect_main_mid(const area_t * coords, const area_t * mask, co uint16_t radius = style->body.radius; color_t mcolor = style->body.main_color; - color_t gcolor = style->body.gradient_color; + color_t gcolor = style->body.grad_color; uint8_t mix; opa_t opa = style->body.opa; cord_t height = area_get_height(coords); @@ -643,7 +643,7 @@ static void lv_draw_rect_main_corner(const area_t * coords, const area_t * mask, uint16_t radius = style->body.radius; color_t mcolor = style->body.main_color; - color_t gcolor = style->body.gradient_color; + color_t gcolor = style->body.grad_color; color_t act_color; opa_t opa = style->body.opa; uint8_t mix; diff --git a/lv_obj/lv_group.c b/lv_obj/lv_group.c index 7517c9140..05d336025 100644 --- a/lv_obj/lv_group.c +++ b/lv_obj/lv_group.c @@ -259,7 +259,7 @@ static void style_mod_def(lv_style_t * style) if(style->body.empty == 0 || style->body.border.width != 0) style->body.border.width = LV_DPI / 20; style->body.main_color = color_mix(style->body.main_color, COLOR_ORANGE, OPA_70); - style->body.gradient_color = color_mix(style->body.gradient_color, COLOR_ORANGE, OPA_70); + style->body.grad_color = color_mix(style->body.grad_color, COLOR_ORANGE, OPA_70); style->body.shadow.color = color_mix(style->body.shadow.color, COLOR_ORANGE, OPA_60); style->text.color = color_mix(style->text.color, COLOR_ORANGE, OPA_70); diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c index c7bf9502a..89b0a4d98 100644 --- a/lv_obj/lv_style.c +++ b/lv_obj/lv_style.c @@ -45,11 +45,11 @@ lv_style_t lv_style_plain; lv_style_t lv_style_plain_color; lv_style_t lv_style_pretty; lv_style_t lv_style_pretty_color; -lv_style_t lv_style_btn_released; -lv_style_t lv_style_btn_pressed; -lv_style_t lv_style_btn_tgl_released; -lv_style_t lv_style_btn_tgl_pressed; -lv_style_t lv_style_btn_inactive; +lv_style_t lv_style_btn_rel; +lv_style_t lv_style_btn_pr; +lv_style_t lv_style_btn_tgl_rel; +lv_style_t lv_style_btn_tgl_pr; +lv_style_t lv_style_btn_ina; /********************** * MACROS @@ -71,7 +71,7 @@ void lv_style_init (void) lv_style_scr.glass = 0; lv_style_scr.body.opa = OPA_COVER; lv_style_scr.body.main_color = COLOR_WHITE; - lv_style_scr.body.gradient_color = COLOR_WHITE; + lv_style_scr.body.grad_color = COLOR_WHITE; lv_style_scr.body.radius = 0; lv_style_scr.body.padding.ver = LV_DPI / 12; lv_style_scr.body.padding.hor = LV_DPI / 12; @@ -109,7 +109,7 @@ void lv_style_init (void) lv_style_plain_color.image.color = COLOR_MAKE(0xf0, 0xf0, 0xf0); lv_style_plain_color.line.color = COLOR_MAKE(0xf0, 0xf0, 0xf0); lv_style_plain_color.body.main_color = COLOR_MAKE(0x55, 0x96, 0xd8); - lv_style_plain_color.body.gradient_color = lv_style_plain_color.body.main_color; + lv_style_plain_color.body.grad_color = lv_style_plain_color.body.main_color; /*Pretty style */ memcpy(&lv_style_pretty, &lv_style_plain, sizeof(lv_style_t)); @@ -117,7 +117,7 @@ void lv_style_init (void) lv_style_pretty.image.color = COLOR_MAKE(0x20, 0x20, 0x20); lv_style_pretty.line.color = COLOR_MAKE(0x20, 0x20, 0x20); lv_style_pretty.body.main_color = COLOR_WHITE; - lv_style_pretty.body.gradient_color = COLOR_SILVER; + lv_style_pretty.body.grad_color = COLOR_SILVER; lv_style_pretty.body.radius = LV_DPI / 15; lv_style_pretty.body.border.color = COLOR_MAKE(0x40, 0x40, 0x40); lv_style_pretty.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1; @@ -129,7 +129,7 @@ void lv_style_init (void) lv_style_pretty_color.image.color = COLOR_MAKE(0xe0, 0xe0, 0xe0); lv_style_pretty_color.line.color = COLOR_MAKE(0xc0, 0xc0, 0xc0); lv_style_pretty_color.body.main_color = COLOR_MAKE(0x6b, 0x9a, 0xc7); - lv_style_pretty_color.body.gradient_color = COLOR_MAKE(0x2b, 0x59, 0x8b); + lv_style_pretty_color.body.grad_color = COLOR_MAKE(0x2b, 0x59, 0x8b); lv_style_pretty_color.body.border.color = COLOR_MAKE(0x15, 0x2c, 0x42); /*Transparent style*/ @@ -148,53 +148,53 @@ void lv_style_init (void) lv_style_transp_tight.body.padding.inner = 0; /*Button released style*/ - memcpy(&lv_style_btn_released, &lv_style_plain, sizeof(lv_style_t)); - lv_style_btn_released.body.main_color = COLOR_MAKE(0x76, 0xa2, 0xd0); - lv_style_btn_released.body.gradient_color = COLOR_MAKE(0x19, 0x3a, 0x5d); - lv_style_btn_released.body.radius = LV_DPI / 15; - lv_style_btn_released.body.padding.hor = LV_DPI / 4; - lv_style_btn_released.body.padding.ver = LV_DPI / 6; - lv_style_btn_released.body.padding.inner = LV_DPI / 10; - lv_style_btn_released.body.border.color = COLOR_MAKE(0x0b, 0x19, 0x28); - lv_style_btn_released.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1; - lv_style_btn_released.body.border.opa = OPA_70; - lv_style_btn_released.text.color = COLOR_MAKE(0xff, 0xff, 0xff); - lv_style_btn_released.body.shadow.color = COLOR_GRAY; - lv_style_btn_released.body.shadow.width = 0; + memcpy(&lv_style_btn_rel, &lv_style_plain, sizeof(lv_style_t)); + lv_style_btn_rel.body.main_color = COLOR_MAKE(0x76, 0xa2, 0xd0); + lv_style_btn_rel.body.grad_color = COLOR_MAKE(0x19, 0x3a, 0x5d); + lv_style_btn_rel.body.radius = LV_DPI / 15; + lv_style_btn_rel.body.padding.hor = LV_DPI / 4; + lv_style_btn_rel.body.padding.ver = LV_DPI / 6; + lv_style_btn_rel.body.padding.inner = LV_DPI / 10; + lv_style_btn_rel.body.border.color = COLOR_MAKE(0x0b, 0x19, 0x28); + lv_style_btn_rel.body.border.width = LV_DPI / 50 >= 1 ? LV_DPI / 50 : 1; + lv_style_btn_rel.body.border.opa = OPA_70; + lv_style_btn_rel.text.color = COLOR_MAKE(0xff, 0xff, 0xff); + lv_style_btn_rel.body.shadow.color = COLOR_GRAY; + lv_style_btn_rel.body.shadow.width = 0; /*Button pressed style*/ - memcpy(&lv_style_btn_pressed, &lv_style_btn_released, sizeof(lv_style_t)); - lv_style_btn_pressed.body.main_color = COLOR_MAKE(0x33, 0x62, 0x94); - lv_style_btn_pressed.body.gradient_color = COLOR_MAKE(0x10, 0x26, 0x3c); - lv_style_btn_pressed.text.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); - lv_style_btn_pressed.image.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); - lv_style_btn_pressed.line.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); + memcpy(&lv_style_btn_pr, &lv_style_btn_rel, sizeof(lv_style_t)); + lv_style_btn_pr.body.main_color = COLOR_MAKE(0x33, 0x62, 0x94); + lv_style_btn_pr.body.grad_color = COLOR_MAKE(0x10, 0x26, 0x3c); + lv_style_btn_pr.text.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); + lv_style_btn_pr.image.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); + lv_style_btn_pr.line.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); /*Button toggle released style*/ - memcpy(&lv_style_btn_tgl_released, &lv_style_btn_released, sizeof(lv_style_t)); - lv_style_btn_tgl_released.body.main_color = COLOR_MAKE(0x0a, 0x11, 0x22); - lv_style_btn_tgl_released.body.gradient_color = COLOR_MAKE(0x37, 0x62, 0x90); - lv_style_btn_tgl_released.body.border.color = COLOR_MAKE(0x01, 0x07, 0x0d); - lv_style_btn_tgl_released.text.color = COLOR_MAKE(0xc8, 0xdd, 0xf4); - lv_style_btn_tgl_released.image.color = COLOR_MAKE(0xc8, 0xdd, 0xf4); - lv_style_btn_tgl_released.line.color = COLOR_MAKE(0xc8, 0xdd, 0xf4); + memcpy(&lv_style_btn_tgl_rel, &lv_style_btn_rel, sizeof(lv_style_t)); + lv_style_btn_tgl_rel.body.main_color = COLOR_MAKE(0x0a, 0x11, 0x22); + lv_style_btn_tgl_rel.body.grad_color = COLOR_MAKE(0x37, 0x62, 0x90); + lv_style_btn_tgl_rel.body.border.color = COLOR_MAKE(0x01, 0x07, 0x0d); + lv_style_btn_tgl_rel.text.color = COLOR_MAKE(0xc8, 0xdd, 0xf4); + lv_style_btn_tgl_rel.image.color = COLOR_MAKE(0xc8, 0xdd, 0xf4); + lv_style_btn_tgl_rel.line.color = COLOR_MAKE(0xc8, 0xdd, 0xf4); /*Button toggle pressed style*/ - memcpy(&lv_style_btn_tgl_pressed, &lv_style_btn_tgl_released, sizeof(lv_style_t)); - lv_style_btn_tgl_pressed.body.main_color = COLOR_MAKE(0x02, 0x14, 0x27); - lv_style_btn_tgl_pressed.body.gradient_color = COLOR_MAKE(0x2b, 0x4c, 0x70); - lv_style_btn_tgl_pressed.text.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); - lv_style_btn_tgl_pressed.image.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); - lv_style_btn_tgl_pressed.line.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); + memcpy(&lv_style_btn_tgl_pr, &lv_style_btn_tgl_rel, sizeof(lv_style_t)); + lv_style_btn_tgl_pr.body.main_color = COLOR_MAKE(0x02, 0x14, 0x27); + lv_style_btn_tgl_pr.body.grad_color = COLOR_MAKE(0x2b, 0x4c, 0x70); + lv_style_btn_tgl_pr.text.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); + lv_style_btn_tgl_pr.image.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); + lv_style_btn_tgl_pr.line.color = COLOR_MAKE(0xa4, 0xb5, 0xc6); /*Button inactive style*/ - memcpy(&lv_style_btn_inactive, &lv_style_btn_released, sizeof(lv_style_t)); - lv_style_btn_inactive.body.main_color = COLOR_MAKE(0xd8, 0xd8, 0xd8); - lv_style_btn_inactive.body.gradient_color = COLOR_MAKE(0xd8, 0xd8, 0xd8); - lv_style_btn_inactive.body.border.color = COLOR_MAKE(0x90, 0x90, 0x90); - lv_style_btn_inactive.text.color = COLOR_MAKE(0x70, 0x70, 0x70); - lv_style_btn_inactive.image.color = COLOR_MAKE(0x70, 0x70, 0x70); - lv_style_btn_inactive.line.color = COLOR_MAKE(0x70, 0x70, 0x70); + memcpy(&lv_style_btn_ina, &lv_style_btn_rel, sizeof(lv_style_t)); + lv_style_btn_ina.body.main_color = COLOR_MAKE(0xd8, 0xd8, 0xd8); + lv_style_btn_ina.body.grad_color = COLOR_MAKE(0xd8, 0xd8, 0xd8); + lv_style_btn_ina.body.border.color = COLOR_MAKE(0x90, 0x90, 0x90); + lv_style_btn_ina.text.color = COLOR_MAKE(0x70, 0x70, 0x70); + lv_style_btn_ina.image.color = COLOR_MAKE(0x70, 0x70, 0x70); + lv_style_btn_ina.line.color = COLOR_MAKE(0x70, 0x70, 0x70); } @@ -267,7 +267,7 @@ static void lv_style_aimator(lv_style_anim_dsc_t * dsc, int32_t val) STYLE_ATTR_ANIM(image.intense, val); act->body.main_color = color_mix(end->body.main_color, start->body.main_color, val); - act->body.gradient_color = color_mix(end->body.gradient_color, start->body.gradient_color, val); + act->body.grad_color = color_mix(end->body.grad_color, start->body.grad_color, val); act->body.border.color = color_mix(end->body.border.color, start->body.border.color, val); act->body.shadow.color = color_mix(end->body.shadow.color, start->body.shadow.color, val); act->text.color = color_mix(end->text.color, start->text.color, val); diff --git a/lv_obj/lv_style.h b/lv_obj/lv_style.h index 973d3577b..54b356bf4 100644 --- a/lv_obj/lv_style.h +++ b/lv_obj/lv_style.h @@ -53,7 +53,7 @@ typedef struct struct { color_t main_color; - color_t gradient_color; + color_t grad_color; cord_t radius; opa_t opa; @@ -162,11 +162,11 @@ extern lv_style_t lv_style_plain; extern lv_style_t lv_style_plain_color; extern lv_style_t lv_style_pretty; extern lv_style_t lv_style_pretty_color; -extern lv_style_t lv_style_btn_released; -extern lv_style_t lv_style_btn_pressed; -extern lv_style_t lv_style_btn_tgl_released; -extern lv_style_t lv_style_btn_tgl_pressed;; -extern lv_style_t lv_style_btn_inactive; +extern lv_style_t lv_style_btn_rel; +extern lv_style_t lv_style_btn_pr; +extern lv_style_t lv_style_btn_tgl_rel; +extern lv_style_t lv_style_btn_tgl_pr;; +extern lv_style_t lv_style_btn_ina; /********************** * MACROS diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c index 315138a54..3388db718 100644 --- a/lv_objx/lv_btn.c +++ b/lv_objx/lv_btn.c @@ -68,11 +68,11 @@ lv_obj_t * lv_btn_create(lv_obj_t * par, lv_obj_t * copy) ext->actions[LV_BTN_ACTION_LONG_PR] = NULL; ext->actions[LV_BTN_ACTION_LONG_PR_REPEAT] = NULL; - ext->styles[LV_BTN_STATE_REL] = &lv_style_btn_released; - ext->styles[LV_BTN_STATE_PR] = &lv_style_btn_pressed; - ext->styles[LV_BTN_STATE_TGL_REL] = &lv_style_btn_tgl_released; - ext->styles[LV_BTN_STATE_TGL_PR] = &lv_style_btn_tgl_pressed; - ext->styles[LV_BTN_STATE_INA] = &lv_style_btn_inactive; + ext->styles[LV_BTN_STATE_REL] = &lv_style_btn_rel; + ext->styles[LV_BTN_STATE_PR] = &lv_style_btn_pr; + ext->styles[LV_BTN_STATE_TGL_REL] = &lv_style_btn_tgl_rel; + ext->styles[LV_BTN_STATE_TGL_PR] = &lv_style_btn_tgl_pr; + ext->styles[LV_BTN_STATE_INA] = &lv_style_btn_ina; ext->long_pr_action_executed = 0; ext->toggle = 0; diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c index 74d4abd13..7c13d7158 100644 --- a/lv_objx/lv_btnm.c +++ b/lv_objx/lv_btnm.c @@ -79,11 +79,11 @@ lv_obj_t * lv_btnm_create(lv_obj_t * par, lv_obj_t * copy) ext->action = NULL; ext->map_p = NULL; ext->toggle = 0; - ext->styles_btn[LV_BTN_STATE_REL] = &lv_style_btn_released; - ext->styles_btn[LV_BTN_STATE_PR] = &lv_style_btn_pressed; - ext->styles_btn[LV_BTN_STATE_TGL_REL] = &lv_style_btn_tgl_released; - ext->styles_btn[LV_BTN_STATE_TGL_PR] = &lv_style_btn_tgl_pressed; - ext->styles_btn[LV_BTN_STATE_INA] = &lv_style_btn_inactive; + ext->styles_btn[LV_BTN_STATE_REL] = &lv_style_btn_rel; + ext->styles_btn[LV_BTN_STATE_PR] = &lv_style_btn_pr; + ext->styles_btn[LV_BTN_STATE_TGL_REL] = &lv_style_btn_tgl_rel; + ext->styles_btn[LV_BTN_STATE_TGL_PR] = &lv_style_btn_tgl_pr; + ext->styles_btn[LV_BTN_STATE_INA] = &lv_style_btn_ina; if(ancestor_design_f == NULL) ancestor_design_f = lv_obj_get_design_func(new_btnm); diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c index 2071b24fd..45106dcd9 100644 --- a/lv_objx/lv_chart.c +++ b/lv_objx/lv_chart.c @@ -554,7 +554,7 @@ static void lv_chart_draw_points(lv_obj_t * chart, const area_t * mask) /*Go through all data lines*/ LL_READ_BACK(ext->series_ll, ser) { style_point.body.main_color = ser->color; - style_point.body.gradient_color = color_mix(COLOR_BLACK, ser->color, ext->series.dark); + style_point.body.grad_color = color_mix(COLOR_BLACK, ser->color, ext->series.dark); for(i = 0; i < ext->point_cnt; i ++) { cir_a.x1 = ((w * i) / (ext->point_cnt - 1)) + x_ofs; @@ -612,7 +612,7 @@ static void lv_chart_draw_cols(lv_obj_t * chart, const area_t * mask) /*Draw the current point of all data line*/ LL_READ_BACK(ext->series_ll, ser) { rects.body.main_color = ser->color; - rects.body.gradient_color = color_mix(COLOR_BLACK, ser->color, ext->series.dark); + rects.body.grad_color = color_mix(COLOR_BLACK, ser->color, ext->series.dark); col_a.x1 = x_act; col_a.x2 = col_a.x1 + col_w; x_act += col_w; diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c index 22b59f362..baf2d27ac 100644 --- a/lv_objx/lv_gauge.c +++ b/lv_objx/lv_gauge.c @@ -406,7 +406,7 @@ static void lv_gauge_draw_needle(lv_obj_t * gauge, const area_t * mask) lv_style_t style_neddle_mid; lv_style_copy(&style_neddle_mid, &lv_style_plain); style_neddle_mid.body.main_color = style->body.border.color; - style_neddle_mid.body.gradient_color = style->body.border.color; + style_neddle_mid.body.grad_color = style->body.border.color; style_neddle_mid.body.radius = LV_RADIUS_CIRCLE; area_t nm_cord; diff --git a/lv_objx/lv_led.c b/lv_objx/lv_led.c index 03e3690f9..8c28378b9 100644 --- a/lv_objx/lv_led.c +++ b/lv_objx/lv_led.c @@ -190,7 +190,7 @@ static bool lv_led_design(lv_obj_t * led, const area_t * mask, lv_design_mode_t /*Mix. the color with black proportionally with brightness*/ leds_tmp.body.main_color = color_mix(leds_tmp.body.main_color, COLOR_BLACK, ext->bright); - leds_tmp.body.gradient_color = color_mix(leds_tmp.body.gradient_color, COLOR_BLACK, ext->bright); + leds_tmp.body.grad_color = color_mix(leds_tmp.body.grad_color, COLOR_BLACK, ext->bright); leds_tmp.body.border.color = color_mix(leds_tmp.body.border.color, COLOR_BLACK, ext->bright); /*Set the current swidth according to brightness proportionally between LV_LED_BRIGHT_OFF and LV_LED_BRIGHT_ON*/ diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index 04deed987..5c7153fe9 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -67,11 +67,11 @@ lv_obj_t * lv_list_create(lv_obj_t * par, lv_obj_t * copy) dm_assert(ext); ext->style_img = NULL; - ext->styles_btn[LV_BTN_STATE_REL] = &lv_style_btn_released; - ext->styles_btn[LV_BTN_STATE_PR] = &lv_style_btn_pressed; - ext->styles_btn[LV_BTN_STATE_TGL_REL] = &lv_style_btn_tgl_released; - ext->styles_btn[LV_BTN_STATE_PR] = &lv_style_btn_tgl_pressed; - ext->styles_btn[LV_BTN_STATE_INA] = &lv_style_btn_inactive; + ext->styles_btn[LV_BTN_STATE_REL] = &lv_style_btn_rel; + ext->styles_btn[LV_BTN_STATE_PR] = &lv_style_btn_pr; + ext->styles_btn[LV_BTN_STATE_TGL_REL] = &lv_style_btn_tgl_rel; + ext->styles_btn[LV_BTN_STATE_PR] = &lv_style_btn_tgl_pr; + ext->styles_btn[LV_BTN_STATE_INA] = &lv_style_btn_ina; ext->anim_time = LV_LIST_FOCUS_TIME; lv_obj_set_signal_func(new_list, lv_list_signal); diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c index d0cfeabdc..7d56d389d 100644 --- a/lv_objx/lv_lmeter.c +++ b/lv_objx/lv_lmeter.c @@ -279,7 +279,7 @@ static bool lv_lmeter_design(lv_obj_t * lmeter, const area_t * mask, lv_design_m if(i > level) style_tmp.line.color = style->line.color; else { - style_tmp.line.color = color_mix(style->body.gradient_color, style->body.main_color, (255 * i) / ext->line_cnt); + style_tmp.line.color = color_mix(style->body.grad_color, style->body.main_color, (255 * i) / ext->line_cnt); } lv_draw_line(&p1, &p2, mask, &style_tmp); diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c index 877428904..edcaa359a 100644 --- a/lv_objx/lv_roller.c +++ b/lv_objx/lv_roller.c @@ -394,13 +394,13 @@ static void draw_bg(lv_obj_t *roller, const area_t *mask) if(union_ok){ color_t main_tmp = style->body.main_color; - color_t grad_tmp = style->body.gradient_color; + color_t grad_tmp = style->body.grad_color; style->body.main_color = grad_tmp; - style->body.gradient_color = main_tmp; + style->body.grad_color = main_tmp; lv_draw_rect(&half_roller, &half_mask, style); style->body.main_color = main_tmp; - style->body.gradient_color = grad_tmp; + style->body.grad_color = grad_tmp; } } diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index f7003d734..64cddc157 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -757,7 +757,7 @@ static bool lv_ta_scrollable_design(lv_obj_t * scrl, const area_t * mask, lv_des color_t ccolor_tmp = cur_style.text.color; /*Make letter color to cursor color*/ cur_style.text.color = cur_style.body.main_color; /*In block mode the letter color will be current background color*/ cur_style.body.main_color = ccolor_tmp; - cur_style.body.gradient_color = ccolor_tmp; + cur_style.body.grad_color = ccolor_tmp; cur_style.body.border.color = ccolor_tmp; cur_style.body.border.opa = OPA_COVER; cur_style.body.border.width = 1 << LV_ANTIALIAS; diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c index a9105837e..1761e4473 100644 --- a/lv_objx/lv_win.c +++ b/lv_objx/lv_win.c @@ -59,8 +59,8 @@ lv_obj_t * lv_win_create(lv_obj_t * par, lv_obj_t * copy) ext->header = NULL; ext->title = NULL; ext->style_header = &lv_style_plain_color; - ext->style_btn_rel = &lv_style_btn_released; - ext->style_btn_pr = &lv_style_btn_pressed; + ext->style_btn_rel = &lv_style_btn_rel; + ext->style_btn_pr = &lv_style_btn_pr; ext->btn_size = ( LV_DPI) / 2; /*Init the new window object*/ diff --git a/lv_themes/lv_theme_alien.c b/lv_themes/lv_theme_alien.c index 4d03e916a..8e3536dd8 100644 --- a/lv_themes/lv_theme_alien.c +++ b/lv_themes/lv_theme_alien.c @@ -79,7 +79,7 @@ static void basic_init(void) def.body.empty = 0; def.body.main_color = COLOR_HEX3(0x222); - def.body.gradient_color = COLOR_HEX3(0x222); + def.body.grad_color = COLOR_HEX3(0x222); def.body.radius = 0; def.body.padding.hor = LV_DPI / 8; def.body.padding.ver = LV_DPI / 8; @@ -105,7 +105,7 @@ static void basic_init(void) /*Background*/ lv_style_copy(&bg, &def); bg.body.main_color = COLOR_HEX3(0x333); - bg.body.gradient_color = COLOR_HEX3(0x333); + bg.body.grad_color = COLOR_HEX3(0x333); bg.body.border.width = 2 << LV_ANTIALIAS; bg.body.border.color = COLOR_HEX3(0x666); bg.body.shadow.color = COLOR_SILVER; @@ -114,7 +114,7 @@ static void basic_init(void) lv_style_copy(&panel, &def); panel.body.radius = LV_DPI / 10; panel.body.main_color = COLOR_HEX3(0x666); - panel.body.gradient_color = COLOR_HEX3(0x666); + panel.body.grad_color = COLOR_HEX3(0x666); panel.body.border.color = COLOR_HEX3(0xccc); panel.body.border.width = 2 << LV_ANTIALIAS; panel.body.border.opa = OPA_60; @@ -129,7 +129,7 @@ static void basic_init(void) sb.body.border.opa = OPA_40; sb.body.border.width = 1 << LV_ANTIALIAS; sb.body.main_color = color_hsv_to_rgb(_hue, 33, 92); - sb.body.gradient_color = color_hsv_to_rgb(_hue, 33, 92); + sb.body.grad_color = color_hsv_to_rgb(_hue, 33, 92); sb.body.padding.hor = 1 << LV_ANTIALIAS; sb.body.padding.ver = 1 << LV_ANTIALIAS; sb.body.padding.inner = LV_DPI / 15; /*Scrollbar width*/ @@ -159,7 +159,7 @@ static void btn_init(void) btn_pr.body.opa = OPA_COVER; btn_pr.body.empty = 0; btn_pr.body.main_color = color_hsv_to_rgb(_hue, 50, 50); - btn_pr.body.gradient_color = color_hsv_to_rgb(_hue, 50, 50); + btn_pr.body.grad_color = color_hsv_to_rgb(_hue, 50, 50); btn_pr.body.border.opa = OPA_60; btn_pr.text.font = _font; btn_pr.text.color = color_hsv_to_rgb(_hue, 10, 100); @@ -168,7 +168,7 @@ static void btn_init(void) btn_trel.body.opa = OPA_COVER; btn_trel.body.empty = 0; btn_trel.body.main_color = color_hsv_to_rgb(_hue, 50, 60); - btn_trel.body.gradient_color = color_hsv_to_rgb(_hue, 50, 60); + btn_trel.body.grad_color = color_hsv_to_rgb(_hue, 50, 60); btn_trel.body.border.opa = OPA_60; btn_trel.body.border.color = color_hsv_to_rgb(_hue, 80, 90); btn_trel.text.font = _font; @@ -178,7 +178,7 @@ static void btn_init(void) btn_tpr.body.opa = OPA_COVER; btn_tpr.body.empty = 0; btn_tpr.body.main_color = color_hsv_to_rgb(_hue, 50, 50); - btn_tpr.body.gradient_color = color_hsv_to_rgb(_hue, 50, 50); + btn_tpr.body.grad_color = color_hsv_to_rgb(_hue, 50, 50); btn_tpr.body.border.opa = OPA_60; btn_tpr.body.border.color = color_hsv_to_rgb(_hue, 80, 70); btn_tpr.text.font = _font; @@ -228,7 +228,7 @@ static void bar_init(void) bar_bg.body.opa = OPA_30; bar_bg.body.radius = LV_RADIUS_CIRCLE; bar_bg.body.main_color = COLOR_WHITE; - bar_bg.body.gradient_color = COLOR_SILVER; + bar_bg.body.grad_color = COLOR_SILVER; bar_bg.body.border.width = 2 << LV_ANTIALIAS; bar_bg.body.border.color = COLOR_SILVER; bar_bg.body.border.opa = OPA_20; @@ -245,7 +245,7 @@ static void bar_init(void) bar_indic.body.padding.ver = 0; bar_indic.body.shadow.width = LV_DPI / 20; bar_indic.body.main_color = color_hsv_to_rgb(_hue, 40, 80); - bar_indic.body.gradient_color = color_hsv_to_rgb(_hue, 40, 80); + bar_indic.body.grad_color = color_hsv_to_rgb(_hue, 40, 80); theme.bar.bg = &bar_bg; theme.bar.indic = &bar_indic; @@ -291,7 +291,7 @@ static void led_init(void) led.body.border.width= LV_DPI / 30; led.body.border.opa = OPA_30; led.body.main_color = color_hsv_to_rgb(_hue, 100, 100); - led.body.gradient_color = color_hsv_to_rgb(_hue, 100, 40); + led.body.grad_color = color_hsv_to_rgb(_hue, 100, 40); led.body.border.color = color_hsv_to_rgb(_hue, 60, 60); led.body.shadow.color = color_hsv_to_rgb(_hue, 100, 100); @@ -306,7 +306,7 @@ static void slider_init(void) slider_knob.body.opa = OPA_60; slider_knob.body.radius = LV_RADIUS_CIRCLE; slider_knob.body.main_color = COLOR_WHITE; - slider_knob.body.gradient_color = COLOR_SILVER; + slider_knob.body.grad_color = COLOR_SILVER; slider_knob.body.border.width = 1 << LV_ANTIALIAS; slider_knob.body.border.color = COLOR_GRAY; slider_knob.body.border.opa = OPA_50; @@ -326,7 +326,7 @@ static void sw_init(void) sw_bg.body.padding.ver = -2 << LV_ANTIALIAS; sw_bg.body.padding.hor = -2 << LV_ANTIALIAS; sw_bg.body.main_color = COLOR_HEX3(0x666); - sw_bg.body.gradient_color = COLOR_HEX3(0x999); + sw_bg.body.grad_color = COLOR_HEX3(0x999); sw_bg.body.border.width = 2 << LV_ANTIALIAS; sw_bg.body.border.opa = OPA_50; @@ -351,7 +351,7 @@ static void lmeter_init(void) #if USE_LV_LMETER != 0 lv_style_copy(&lmeter_bg, &def); lmeter_bg.body.main_color = color_hsv_to_rgb(_hue, 10, 70); - lmeter_bg.body.gradient_color = color_hsv_to_rgb(_hue, 80, 80); + lmeter_bg.body.grad_color = color_hsv_to_rgb(_hue, 80, 80); lmeter_bg.body.padding.hor = LV_DPI / 8; /*Scale line length*/ lmeter_bg.line.color = COLOR_HEX3(0x555); lmeter_bg.line.width = 2 << LV_ANTIALIAS; @@ -367,7 +367,7 @@ static void gauge_init(void) static lv_style_t gauge_bg; lv_style_copy(&gauge_bg, &def); gauge_bg.body.main_color = color_hsv_to_rgb(_hue, 10, 70); - gauge_bg.body.gradient_color = color_hsv_to_rgb(_hue, 80, 80); + gauge_bg.body.grad_color = color_hsv_to_rgb(_hue, 80, 80); gauge_bg.body.padding.hor = LV_DPI / 12; /*Scale line length*/ gauge_bg.body.padding.ver = LV_DPI / 10; /*Needle center size*/ gauge_bg.body.padding.inner = LV_DPI / 8; /*Label - scale distance*/ @@ -397,7 +397,7 @@ static void cb_init(void) cb_rel.body.border.width = 1 << LV_ANTIALIAS; cb_rel.body.border.color = COLOR_GRAY; cb_rel.body.main_color = COLOR_WHITE; - cb_rel.body.gradient_color = COLOR_SILVER; + cb_rel.body.grad_color = COLOR_SILVER; lv_style_copy(&cb_bg, &bg); cb_bg.body.empty = 1; @@ -416,19 +416,19 @@ static void cb_init(void) cb_trel.body.border.color = COLOR_WHITE; cb_trel.body.border.opa = OPA_60; cb_trel.body.main_color = color_hsv_to_rgb(_hue, 50, 82); - cb_trel.body.gradient_color = color_hsv_to_rgb(_hue, 50, 62); + cb_trel.body.grad_color = color_hsv_to_rgb(_hue, 50, 62); lv_style_copy(&cb_tpr, &cb_trel); cb_tpr.body.border.color = COLOR_SILVER; cb_tpr.body.border.opa = OPA_70; cb_tpr.body.main_color = color_hsv_to_rgb(_hue, 50, 72); - cb_tpr.body.gradient_color = color_hsv_to_rgb(_hue, 50, 52); + cb_tpr.body.grad_color = color_hsv_to_rgb(_hue, 50, 52); lv_style_copy(&cb_ina, &cb_trel); cb_ina.body.border.width = 1 << LV_ANTIALIAS; cb_ina.body.border.color = COLOR_GRAY; cb_ina.body.main_color = COLOR_SILVER; - cb_ina.body.gradient_color = COLOR_SILVER; + cb_ina.body.grad_color = COLOR_SILVER; theme.cb.bg = &cb_bg; theme.cb.box.rel = &cb_rel; @@ -457,7 +457,7 @@ static void btnm_init(void) lv_style_copy(&btnm_pr, &lv_style_plain); btnm_pr.body.main_color = color_hsv_to_rgb(_hue, 40, 70); - btnm_pr.body.gradient_color = color_hsv_to_rgb(_hue, 40, 70); + btnm_pr.body.grad_color = color_hsv_to_rgb(_hue, 40, 70); btnm_pr.body.radius = LV_DPI / 8; btnm_pr.text.color = color_hsv_to_rgb(_hue, 40, 40); btnm_pr.text.font = _font; @@ -539,7 +539,7 @@ static void list_init(void) list_pr.body.empty = 0; list_pr.body.opa = OPA_COVER; list_pr.body.main_color = color_hsv_to_rgb(_hue, 34, 41); - list_pr.body.gradient_color = color_hsv_to_rgb(_hue, 34, 41); + list_pr.body.grad_color = color_hsv_to_rgb(_hue, 34, 41); list_pr.text.color = color_hsv_to_rgb(_hue, 7, 96); lv_style_copy(&list_trel, &list_rel); @@ -569,7 +569,7 @@ static void ddlist_init(void) lv_style_copy(&ddlist_sel, &panel); ddlist_sel.body.main_color = color_hsv_to_rgb(_hue, 45, 70); - ddlist_sel.body.gradient_color = color_hsv_to_rgb(_hue, 45, 70); + ddlist_sel.body.grad_color = color_hsv_to_rgb(_hue, 45, 70); ddlist_sel.body.opa = OPA_COVER; ddlist_sel.body.radius = 0; @@ -587,7 +587,7 @@ static void roller_init(void) roller_bg.text.line_space = LV_DPI / 6; roller_bg.body.radius = LV_DPI / 20; roller_bg.body.main_color = COLOR_HEX3(0x333); - roller_bg.body.gradient_color = COLOR_HEX3(0x999); + roller_bg.body.grad_color = COLOR_HEX3(0x999); roller_bg.body.border.opa = OPA_30; roller_bg.text.opa = OPA_70; roller_bg.text.color = color_hsv_to_rgb(_hue, 20, 70); @@ -610,7 +610,7 @@ static void tabview_init(void) static lv_style_t tab_rel, tab_pr, tab_trel, tab_tpr, tab_indic; lv_style_copy(&tab_rel, &def); tab_rel.body.main_color = COLOR_HEX3(0x666); - tab_rel.body.gradient_color = COLOR_HEX3(0x666); + tab_rel.body.grad_color = COLOR_HEX3(0x666); tab_rel.body.padding.hor = 0; tab_rel.body.padding.ver = 0; tab_rel.body.padding.inner = 0; @@ -622,7 +622,7 @@ static void tabview_init(void) lv_style_copy(&tab_pr, &tab_rel); tab_pr.body.main_color = COLOR_HEX3(0x444); - tab_pr.body.gradient_color = COLOR_HEX3(0x444); + tab_pr.body.grad_color = COLOR_HEX3(0x444); lv_style_copy(&tab_trel, &def); tab_trel.body.empty = 1; @@ -637,7 +637,7 @@ static void tabview_init(void) lv_style_copy(&tab_tpr, &def); tab_tpr.body.main_color = COLOR_GRAY; - tab_tpr.body.gradient_color = COLOR_GRAY; + tab_tpr.body.grad_color = COLOR_GRAY; tab_tpr.body.padding.hor = 0; tab_tpr.body.padding.ver = 0; tab_tpr.body.padding.inner = 0; @@ -650,7 +650,7 @@ static void tabview_init(void) lv_style_copy(&tab_indic, &def); tab_indic.body.border.width = 0; tab_indic.body.main_color = color_hsv_to_rgb(_hue, 80, 87); - tab_indic.body.gradient_color = color_hsv_to_rgb(_hue, 80, 87); + tab_indic.body.grad_color = color_hsv_to_rgb(_hue, 80, 87); tab_indic.body.padding.inner = LV_DPI / 10; /*Indicator height*/ theme.tabview.bg = &bg; @@ -673,7 +673,7 @@ static void win_init(void) win_header.body.padding.hor = LV_DPI / 12; win_header.body.padding.ver = LV_DPI / 20; win_header.body.main_color = color_hsv_to_rgb(_hue, 20, 50); - win_header.body.gradient_color = win_header.body.main_color; + win_header.body.grad_color = win_header.body.main_color; win_header.body.border.opa = panel.body.border.opa; win_header.body.border.width = panel.body.border.width; win_header.body.border.color = color_hsv_to_rgb(_hue, 20, 80); diff --git a/lv_themes/lv_theme_default.c b/lv_themes/lv_theme_default.c index c47d9f690..6baeb20c6 100644 --- a/lv_themes/lv_theme_default.c +++ b/lv_themes/lv_theme_default.c @@ -58,7 +58,7 @@ static void basic_init(void) lv_style_copy(&def, &lv_style_pretty); /*Initialize the default style*/ lv_style_copy(&sb, &lv_style_pretty_color); - sb.body.gradient_color = sb.body.main_color; + sb.body.grad_color = sb.body.main_color; sb.body.padding.hor = sb.body.padding.hor / 2; /*Make closer to the edges*/ sb.body.padding.ver = sb.body.padding.ver / 2; @@ -76,7 +76,7 @@ static void btn_init(void) #if USE_LV_BTN != 0 theme.btn.rel = &lv_style_btn_released; theme.btn.pr = &lv_style_btn_pressed; - theme.btn.tgl_rel = &lv_style_btn_tgl_released; + theme.btn.tgl_rel = &lv_style_btn_tgl_rel; theme.btn.tgl_pr = &lv_style_btn_tgl_pressed; theme.btn.ina = &lv_style_btn_inactive; #endif @@ -182,7 +182,7 @@ static void lmeter_init(void) lmeter.line.color = COLOR_HEX3(0xddd); lmeter.line.width = 2 << LV_ANTIALIAS; lmeter.body.main_color = color_mix(lmeter.body.main_color , COLOR_WHITE, OPA_50); - lmeter.body.gradient_color = color_mix(lmeter.body.gradient_color , COLOR_BLACK, OPA_50); + lmeter.body.grad_color = color_mix(lmeter.body.grad_color , COLOR_BLACK, OPA_50); theme.lmeter = &lmeter; #endif @@ -214,7 +214,7 @@ static void cb_init(void) theme.cb.bg = &lv_style_transp; theme.cb.box.rel = &lv_style_pretty; theme.cb.box.pr = &lv_style_btn_pressed; - theme.cb.box.tgl_rel = &lv_style_btn_tgl_released; + theme.cb.box.tgl_rel = &lv_style_btn_tgl_rel; theme.cb.box.tgl_pr = &lv_style_btn_tgl_pressed; theme.cb.box.ina = &lv_style_btn_inactive; #endif @@ -229,7 +229,7 @@ static void btnm_init(void) theme.btnm.bg = &lv_style_pretty; theme.btnm.btn.rel = &lv_style_btn_released; theme.btnm.btn.pr = &lv_style_btn_pressed; - theme.btnm.btn.tgl_rel = &lv_style_btn_tgl_released; + theme.btnm.btn.tgl_rel = &lv_style_btn_tgl_rel; theme.btnm.btn.tgl_pr = &lv_style_btn_tgl_pressed; theme.btnm.btn.ina = &lv_style_btn_inactive; #endif @@ -243,7 +243,7 @@ static void kb_init(void) theme.kb.bg = &lv_style_pretty; theme.kb.btn.rel = &lv_style_btn_released; theme.kb.btn.pr = &lv_style_btn_pressed; - theme.kb.btn.tgl_rel = &lv_style_btn_tgl_released; + theme.kb.btn.tgl_rel = &lv_style_btn_tgl_rel; theme.kb.btn.tgl_pr = &lv_style_btn_tgl_pressed; theme.kb.btn.ina = &lv_style_btn_inactive; #endif @@ -294,7 +294,7 @@ static void list_init(void) theme.list.sb = &sb; theme.list.btn.rel = &lv_style_btn_released; theme.list.btn.pr = &lv_style_btn_pressed; - theme.list.btn.tgl_rel = &lv_style_btn_tgl_released; + theme.list.btn.tgl_rel = &lv_style_btn_tgl_rel; theme.list.btn.tgl_pr = &lv_style_btn_tgl_pressed; theme.list.btn.ina = &lv_style_btn_inactive; #endif @@ -332,7 +332,7 @@ static void tabview_init(void) theme.tabview.btn.bg = &lv_style_transp; theme.tabview.btn.rel = &lv_style_btn_released; theme.tabview.btn.pr = &lv_style_btn_pressed; - theme.tabview.btn.tgl_rel = &lv_style_btn_tgl_released; + theme.tabview.btn.tgl_rel = &lv_style_btn_tgl_rel; theme.tabview.btn.tgl_pr = &lv_style_btn_tgl_pressed; #endif }