From 588673652273e233e7be1f8730f005f961632231 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Sun, 23 Feb 2020 07:51:33 +0100 Subject: [PATCH] renames in styles: TRANS->TRANSITION, WIDTH/HEIGHT->TRANSFORM_WIDTH/HEIGHT --- src/lv_core/lv_obj.c | 40 ++++++++++++++--------------- src/lv_core/lv_obj_style_dec.h | 24 +++++++++--------- src/lv_core/lv_style.c | 6 ++--- src/lv_core/lv_style.h | 24 +++++++++--------- src/lv_themes/lv_theme_material.c | 42 +++++++++++++++---------------- src/lv_widgets/lv_label.c | 4 +-- 6 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index 31e306af0..bc704f86e 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -1513,16 +1513,16 @@ void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state) if(style_list == NULL) break; /*No more style lists*/ if(style_list->ignore_trans) continue; - lv_style_int_t time = lv_obj_get_style_trans_time(obj, part); + lv_style_int_t time = lv_obj_get_style_transition_time(obj, part); lv_style_property_t props[LV_STYLE_TRANS_NUM_MAX]; - lv_style_int_t delay = lv_obj_get_style_trans_delay(obj, part); - lv_anim_path_cb_t path = lv_obj_get_style_trans_path(obj, part); - props[0] = lv_obj_get_style_trans_prop_1(obj, part); - props[1] = lv_obj_get_style_trans_prop_2(obj, part); - props[2] = lv_obj_get_style_trans_prop_3(obj, part); - props[3] = lv_obj_get_style_trans_prop_4(obj, part); - props[4] = lv_obj_get_style_trans_prop_5(obj, part); - props[5] = lv_obj_get_style_trans_prop_6(obj, part); + lv_style_int_t delay = lv_obj_get_style_transition_delay(obj, part); + lv_anim_path_cb_t path = lv_obj_get_style_transition_path(obj, part); + props[0] = lv_obj_get_style_transition_prop_1(obj, part); + props[1] = lv_obj_get_style_transition_prop_2(obj, part); + props[2] = lv_obj_get_style_transition_prop_3(obj, part); + props[3] = lv_obj_get_style_transition_prop_4(obj, part); + props[4] = lv_obj_get_style_transition_prop_5(obj, part); + props[5] = lv_obj_get_style_transition_prop_6(obj, part); uint8_t i; @@ -2409,7 +2409,7 @@ const void * _lv_obj_get_style_ptr(const lv_obj_t * obj, uint8_t part, lv_style_ case LV_STYLE_VALUE_FONT: return LV_THEME_DEFAULT_FONT_NORMAL; #if LV_USE_ANIMATION - case LV_STYLE_TRANS_PATH: + case LV_STYLE_TRANSITION_PATH: return lv_anim_path_linear; #endif } @@ -3114,8 +3114,8 @@ lv_coord_t lv_obj_get_draw_rect_ext_pad_size(lv_obj_t * obj, uint8_t part) } } - lv_coord_t w = lv_obj_get_style_width(obj, part); - lv_coord_t h = lv_obj_get_style_height(obj, part); + lv_coord_t w = lv_obj_get_style_transform_width(obj, part); + lv_coord_t h = lv_obj_get_style_transform_height(obj, part); lv_coord_t wh = LV_MATH_MAX(w, h); if(wh > 0) s += wh; @@ -3196,8 +3196,8 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area if(mode == LV_DESIGN_COVER_CHK) { /*Most trivial test. Is the mask fully IN the object? If no it surely doesn't cover it*/ lv_coord_t r = lv_obj_get_style_radius(obj, LV_OBJ_PART_MAIN); - lv_coord_t w = lv_obj_get_style_width(obj, LV_OBJ_PART_MAIN); - lv_coord_t h = lv_obj_get_style_height(obj, LV_OBJ_PART_MAIN); + lv_coord_t w = lv_obj_get_style_transform_width(obj, LV_OBJ_PART_MAIN); + lv_coord_t h = lv_obj_get_style_transform_height(obj, LV_OBJ_PART_MAIN); lv_area_t coords; lv_area_copy(&coords, &obj->coords); coords.x1 -= w; @@ -3229,8 +3229,8 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area lv_obj_init_draw_rect_dsc(obj, LV_OBJ_PART_MAIN, &draw_dsc); - lv_coord_t w = lv_obj_get_style_width(obj, LV_OBJ_PART_MAIN); - lv_coord_t h = lv_obj_get_style_height(obj, LV_OBJ_PART_MAIN); + lv_coord_t w = lv_obj_get_style_transform_width(obj, LV_OBJ_PART_MAIN); + lv_coord_t h = lv_obj_get_style_transform_height(obj, LV_OBJ_PART_MAIN); lv_area_t coords; lv_area_copy(&coords, &obj->coords); coords.x1 -= w; @@ -3265,8 +3265,8 @@ static lv_design_res_t lv_obj_design(lv_obj_t * obj, const lv_area_t * clip_area draw_dsc.shadow_opa = LV_OPA_TRANSP; lv_obj_init_draw_rect_dsc(obj, LV_OBJ_PART_MAIN, &draw_dsc); - lv_coord_t w = lv_obj_get_style_width(obj, LV_OBJ_PART_MAIN); - lv_coord_t h = lv_obj_get_style_height(obj, LV_OBJ_PART_MAIN); + lv_coord_t w = lv_obj_get_style_transform_width(obj, LV_OBJ_PART_MAIN); + lv_coord_t h = lv_obj_get_style_transform_height(obj, LV_OBJ_PART_MAIN); lv_area_t coords; lv_area_copy(&coords, &obj->coords); coords.x1 -= w; @@ -3519,7 +3519,7 @@ static lv_style_trans_t * trans_create(lv_obj_t * obj, lv_style_property_t prop, { lv_style_trans_t * tr; lv_style_list_t * style_list = lv_obj_get_style_list(obj, part); - lv_style_t * style_trans = lv_style_list_get_trans_style(style_list); + lv_style_t * style_trans = lv_style_list_get_transition_style(style_list); /*Get the previous and current values*/ if((prop & 0xF) < LV_STYLE_ID_COLOR) { /*Int*/ @@ -3644,7 +3644,7 @@ static void trans_del(lv_obj_t * obj, uint8_t part, lv_style_property_t prop) static void trans_anim_cb(lv_style_trans_t * tr, lv_anim_value_t v) { lv_style_list_t * list = lv_obj_get_style_list(tr->obj, tr->part); - lv_style_t * style = lv_style_list_get_trans_style(list); + lv_style_t * style = lv_style_list_get_transition_style(list); if((tr->prop & 0xF) < LV_STYLE_ID_COLOR) { /*Value*/ lv_style_int_t x; diff --git a/src/lv_core/lv_obj_style_dec.h b/src/lv_core/lv_obj_style_dec.h index 9dc7b1fa8..f02952aad 100644 --- a/src/lv_core/lv_obj_style_dec.h +++ b/src/lv_core/lv_obj_style_dec.h @@ -70,8 +70,8 @@ static inline void lv_style_set_##func_name (lv_style_t * style, lv_state_t stat _LV_OBJ_STYLE_SET_GET_DECLARE(RADIUS, radius, lv_style_int_t,_int, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(CLIP_CORNER, clip_corner, bool, _int, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(SIZE, size, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(WIDTH, width, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(HEIGHT, height, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSFORM_WIDTH, transform_width, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSFORM_HEIGHT, transform_height, lv_style_int_t, _int, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(OPA_SCALE, opa_scale, lv_opa_t, _opa, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(PAD_TOP, pad_top, lv_style_int_t, _int, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(PAD_BOTTOM, pad_bottom, lv_style_int_t, _int, scalar) @@ -138,18 +138,18 @@ _LV_OBJ_STYLE_SET_GET_DECLARE(IMAGE_BLEND_MODE, image_blend_mode, lv_blend_mode_ _LV_OBJ_STYLE_SET_GET_DECLARE(IMAGE_RECOLOR, image_recolor, lv_color_t, _color, nonscalar) _LV_OBJ_STYLE_SET_GET_DECLARE(IMAGE_OPA, image_opa, lv_opa_t, _opa, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(IMAGE_RECOLOR_OPA, image_recolor_opa, lv_opa_t, _opa, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_TIME, trans_time, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_DELAY, trans_delay, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PROP_1, trans_prop_1, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PROP_2, trans_prop_2, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PROP_3, trans_prop_3, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PROP_4, trans_prop_4, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PROP_5, trans_prop_5, lv_style_int_t, _int, scalar) -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PROP_6, trans_prop_6, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_TIME, transition_time, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_DELAY, transition_delay, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PROP_1, transition_prop_1, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PROP_2, transition_prop_2, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PROP_3, transition_prop_3, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PROP_4, transition_prop_4, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PROP_5, transition_prop_5, lv_style_int_t, _int, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PROP_6, transition_prop_6, lv_style_int_t, _int, scalar) #if LV_USE_ANIMATION -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PATH, trans_path, const lv_anim_path_cb_t , _ptr, scalar) +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PATH, transition_path, const lv_anim_path_cb_t , _ptr, scalar) #else -_LV_OBJ_STYLE_SET_GET_DECLARE(TRANS_PATH, trans_path, const void * , _ptr, scalar) /*For compatibility*/ +_LV_OBJ_STYLE_SET_GET_DECLARE(TRANSITION_PATH, transition_path, const void * , _ptr, scalar) /*For compatibility*/ #endif _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_WIDTH, scale_width, lv_style_int_t, _int, scalar) _LV_OBJ_STYLE_SET_GET_DECLARE(SCALE_BORDER_WIDTH, scale_border_width, lv_style_int_t, _int, scalar) diff --git a/src/lv_core/lv_style.c b/src/lv_core/lv_style.c index d1aa168d7..d7a4060d6 100644 --- a/src/lv_core/lv_style.c +++ b/src/lv_core/lv_style.c @@ -292,7 +292,7 @@ void lv_style_list_reset(lv_style_list_t * list) } if(list->has_trans) { - lv_style_t * trans = lv_style_list_get_trans_style(list); + lv_style_t * trans = lv_style_list_get_transition_style(list); if(trans) { lv_style_reset(trans); lv_mem_free(trans); @@ -686,7 +686,7 @@ lv_style_t * lv_style_list_get_local_style(lv_style_list_t * list) * @param list pointer to a style list where the local property should be set * @return pointer to the transition style if exists else `NULL`. */ -lv_style_t * lv_style_list_get_trans_style(lv_style_list_t * list) +lv_style_t * lv_style_list_get_transition_style(lv_style_list_t * list) { LV_ASSERT_STYLE_LIST(list); @@ -702,7 +702,7 @@ lv_style_t * lv_style_list_get_trans_style(lv_style_list_t * list) lv_style_t * lv_style_list_add_trans_style(lv_style_list_t * list) { LV_ASSERT_STYLE_LIST(list); - if(list->has_trans) return lv_style_list_get_trans_style(list); + if(list->has_trans) return lv_style_list_get_transition_style(list); lv_style_t * trans_style = lv_mem_alloc(sizeof(lv_style_t)); LV_ASSERT_MEM(trans_style); diff --git a/src/lv_core/lv_style.h b/src/lv_core/lv_style.h index a0493fdcd..a4c2de6e0 100644 --- a/src/lv_core/lv_style.h +++ b/src/lv_core/lv_style.h @@ -96,8 +96,8 @@ enum { LV_STYLE_PROP_INIT(LV_STYLE_RADIUS, 0x0, LV_STYLE_ID_VALUE + 1, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_CLIP_CORNER, 0x0, LV_STYLE_ID_VALUE + 2, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_SIZE, 0x0, LV_STYLE_ID_VALUE + 3, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_WIDTH, 0x0, LV_STYLE_ID_VALUE + 4, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_HEIGHT, 0x0, LV_STYLE_ID_VALUE + 5, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSFORM_WIDTH, 0x0, LV_STYLE_ID_VALUE + 4, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSFORM_HEIGHT, 0x0, LV_STYLE_ID_VALUE + 5, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_OPA_SCALE, 0x0, LV_STYLE_ID_OPA + 0, LV_STYLE_ATTR_INHERIT), LV_STYLE_PROP_INIT(LV_STYLE_PAD_TOP, 0x1, LV_STYLE_ID_VALUE + 0, LV_STYLE_ATTR_NONE), @@ -175,15 +175,15 @@ enum { LV_STYLE_PROP_INIT(LV_STYLE_IMAGE_OPA, 0xA, LV_STYLE_ID_OPA + 0, LV_STYLE_ATTR_INHERIT), LV_STYLE_PROP_INIT(LV_STYLE_IMAGE_RECOLOR_OPA, 0xA, LV_STYLE_ID_OPA + 1, LV_STYLE_ATTR_INHERIT), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_TIME, 0xB, LV_STYLE_ID_VALUE + 0, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_DELAY, 0xB, LV_STYLE_ID_VALUE + 1, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PROP_1, 0xB, LV_STYLE_ID_VALUE + 2, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PROP_2, 0xB, LV_STYLE_ID_VALUE + 3, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PROP_3, 0xB, LV_STYLE_ID_VALUE + 4, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PROP_4, 0xB, LV_STYLE_ID_VALUE + 5, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PROP_5, 0xB, LV_STYLE_ID_VALUE + 6, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PROP_6, 0xB, LV_STYLE_ID_VALUE + 7, LV_STYLE_ATTR_NONE), - LV_STYLE_PROP_INIT(LV_STYLE_TRANS_PATH, 0xB, LV_STYLE_ID_PTR + 0, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_TIME, 0xB, LV_STYLE_ID_VALUE + 0, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_DELAY, 0xB, LV_STYLE_ID_VALUE + 1, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PROP_1, 0xB, LV_STYLE_ID_VALUE + 2, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PROP_2, 0xB, LV_STYLE_ID_VALUE + 3, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PROP_3, 0xB, LV_STYLE_ID_VALUE + 4, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PROP_4, 0xB, LV_STYLE_ID_VALUE + 5, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PROP_5, 0xB, LV_STYLE_ID_VALUE + 6, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PROP_6, 0xB, LV_STYLE_ID_VALUE + 7, LV_STYLE_ATTR_NONE), + LV_STYLE_PROP_INIT(LV_STYLE_TRANSITION_PATH, 0xB, LV_STYLE_ID_PTR + 0, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_SCALE_WIDTH, 0xC, LV_STYLE_ID_VALUE + 0, LV_STYLE_ATTR_NONE), LV_STYLE_PROP_INIT(LV_STYLE_SCALE_BORDER_WIDTH, 0xC, LV_STYLE_ID_VALUE + 1, LV_STYLE_ATTR_NONE), @@ -431,7 +431,7 @@ lv_style_t * lv_style_list_get_local_style(lv_style_list_t * list); * @param list pointer to a style list where the local property should be set * @return pointer to the transition style if exists else `NULL`. */ -lv_style_t * lv_style_list_get_trans_style(lv_style_list_t * list); +lv_style_t * lv_style_list_get_transition_style(lv_style_list_t * list); /** * Allocate the transition style in a style list. If already exists simply return it. diff --git a/src/lv_themes/lv_theme_material.c b/src/lv_themes/lv_theme_material.c index 8124dd908..5fcb19f07 100644 --- a/src/lv_themes/lv_theme_material.c +++ b/src/lv_themes/lv_theme_material.c @@ -184,13 +184,13 @@ static void basic_init(void) lv_style_set_image_recolor(&panel, LV_STATE_DEFAULT, color_panel_txt(LV_STATE_DEFAULT)); lv_style_set_line_color(&panel, LV_STATE_DEFAULT, color_panel_txt(LV_STATE_DEFAULT)); lv_style_set_line_width(&panel, LV_STATE_DEFAULT, 1); - lv_style_set_trans_time(&panel, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_time(&panel, LV_STATE_DEFAULT, TRANSITION_TIME); lv_style_set_pad_left(&panel, LV_STATE_DEFAULT, LV_DPI / 5); lv_style_set_pad_right(&panel, LV_STATE_DEFAULT, LV_DPI / 5); lv_style_set_pad_top(&panel, LV_STATE_DEFAULT, LV_DPI / 5); lv_style_set_pad_bottom(&panel, LV_STATE_DEFAULT, LV_DPI / 5); lv_style_set_pad_inner(&panel, LV_STATE_DEFAULT, LV_DPI / 5); - lv_style_set_trans_prop_1(&panel, LV_STATE_DEFAULT, LV_STYLE_BORDER_COLOR); + lv_style_set_transition_prop_1(&panel, LV_STATE_DEFAULT, LV_STYLE_BORDER_COLOR); lv_style_init(&bg); lv_style_set_radius(&bg, LV_STATE_DEFAULT, LV_DPI / 25); @@ -210,7 +210,7 @@ static void basic_init(void) lv_style_set_pad_top(&bg, LV_STATE_DEFAULT, LV_DPI / 5); lv_style_set_pad_bottom(&bg, LV_STATE_DEFAULT, LV_DPI / 5); lv_style_set_pad_inner(&bg, LV_STATE_DEFAULT, LV_DPI / 5); - lv_style_set_trans_time(&panel, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_time(&panel, LV_STATE_DEFAULT, TRANSITION_TIME); lv_style_init(&btn); lv_style_set_radius(&btn, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE); @@ -245,11 +245,11 @@ static void basic_init(void) lv_style_set_outline_opa(&btn, LV_STATE_DEFAULT, LV_OPA_0); lv_style_set_outline_opa(&btn, LV_STATE_FOCUSED, LV_OPA_50); lv_style_set_outline_color(&btn, LV_STATE_DEFAULT, _color_primary); - lv_style_set_trans_time(&btn, LV_STATE_DEFAULT, TRANSITION_TIME); - lv_style_set_trans_prop_5(&btn, LV_STATE_DEFAULT, LV_STYLE_BG_COLOR); - lv_style_set_trans_prop_6(&btn, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA); - lv_style_set_trans_delay(&btn, LV_STATE_DEFAULT, 100); - lv_style_set_trans_delay(&btn, LV_STATE_PRESSED, 0); + lv_style_set_transition_time(&btn, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_prop_5(&btn, LV_STATE_DEFAULT, LV_STYLE_BG_COLOR); + lv_style_set_transition_prop_6(&btn, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA); + lv_style_set_transition_delay(&btn, LV_STATE_DEFAULT, 100); + lv_style_set_transition_delay(&btn, LV_STATE_PRESSED, 0); lv_style_init(&pad); lv_style_set_pad_inner(&pad, LV_STATE_DEFAULT, LV_DPI / 10); @@ -292,8 +292,8 @@ static void bar_init(void) lv_style_set_outline_opa(&bar_bg, LV_STATE_DEFAULT, LV_OPA_TRANSP); lv_style_set_outline_opa(&bar_bg, LV_STATE_FOCUSED, LV_OPA_50); lv_style_set_outline_width(&bar_bg, LV_STATE_DEFAULT, 3); - lv_style_set_trans_time(&bar_bg, LV_STATE_DEFAULT, TRANSITION_TIME); - lv_style_set_trans_prop_6(&bar_bg, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA); + lv_style_set_transition_time(&bar_bg, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_prop_6(&bar_bg, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA); lv_style_init(&bar_indic); lv_style_set_bg_opa(&bar_indic, LV_STATE_DEFAULT, LV_OPA_COVER); @@ -544,8 +544,8 @@ static void checkbox_init(void) lv_style_set_outline_opa(&cb_bg, LV_STATE_FOCUSED, LV_OPA_50); lv_style_set_outline_width(&cb_bg, LV_STATE_DEFAULT, 3); lv_style_set_outline_pad(&cb_bg, LV_STATE_DEFAULT, LV_DPI/20); - lv_style_set_trans_time(&cb_bg, LV_STATE_DEFAULT, TRANSITION_TIME); - lv_style_set_trans_prop_6(&cb_bg, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA); + lv_style_set_transition_time(&cb_bg, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_prop_6(&cb_bg, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA); lv_style_init(&cb_bullet); lv_style_set_radius(&cb_bullet, LV_STATE_DEFAULT, LV_DPI / 50); @@ -558,9 +558,9 @@ static void checkbox_init(void) lv_style_set_pattern_image(&cb_bullet, LV_STATE_CHECKED, LV_SYMBOL_OK); lv_style_set_pattern_recolor(&cb_bullet, LV_STATE_CHECKED, LV_COLOR_WHITE); lv_style_set_text_font(&cb_bullet, LV_STATE_CHECKED, _font_small); - lv_style_set_trans_time(&cb_bullet, LV_STATE_DEFAULT , TRANSITION_TIME); - lv_style_set_trans_prop_5(&cb_bullet, LV_STATE_DEFAULT, LV_STYLE_BG_OPA); - lv_style_set_trans_prop_6(&cb_bullet, LV_STATE_DEFAULT, LV_STYLE_BORDER_COLOR); + lv_style_set_transition_time(&cb_bullet, LV_STATE_DEFAULT , TRANSITION_TIME); + lv_style_set_transition_prop_5(&cb_bullet, LV_STATE_DEFAULT, LV_STYLE_BG_OPA); + lv_style_set_transition_prop_6(&cb_bullet, LV_STATE_DEFAULT, LV_STYLE_BORDER_COLOR); #endif } @@ -649,8 +649,8 @@ static void textarea_init(void) lv_style_set_pad_right(&ta_oneline, LV_STATE_DEFAULT, LV_DPI / 10); lv_style_set_pad_top(&ta_oneline, LV_STATE_DEFAULT, LV_DPI / 10); lv_style_set_pad_bottom(&ta_oneline, LV_STATE_DEFAULT, LV_DPI / 10); - lv_style_set_trans_time(&ta_oneline, LV_STATE_DEFAULT, TRANSITION_TIME); - lv_style_set_trans_prop_6(&ta_oneline, LV_STATE_DEFAULT, LV_STYLE_BORDER_COLOR); + lv_style_set_transition_time(&ta_oneline, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_prop_6(&ta_oneline, LV_STATE_DEFAULT, LV_STYLE_BORDER_COLOR); lv_style_init(&ta_placeholder); lv_style_set_text_color(&ta_placeholder, LV_STATE_DEFAULT, lv_color_hex(0x3b3e43)); @@ -714,10 +714,10 @@ static void list_init(void) lv_style_set_pad_top(&list_btn, LV_STATE_DEFAULT, LV_DPI / 10); lv_style_set_pad_bottom(&list_btn, LV_STATE_DEFAULT, LV_DPI / 10); lv_style_set_pad_inner(&list_btn, LV_STATE_DEFAULT, LV_DPI / 10); - lv_style_set_trans_time(&list_btn, LV_STATE_DEFAULT, TRANSITION_TIME); - lv_style_set_trans_prop_4(&list_btn, LV_STATE_DEFAULT, LV_STYLE_RADIUS); - lv_style_set_trans_prop_5(&list_btn, LV_STATE_DEFAULT, LV_STYLE_BG_OPA); - lv_style_set_trans_prop_6(&list_btn, LV_STATE_DEFAULT, LV_STYLE_BG_OPA); + lv_style_set_transition_time(&list_btn, LV_STATE_DEFAULT, TRANSITION_TIME); + lv_style_set_transition_prop_4(&list_btn, LV_STATE_DEFAULT, LV_STYLE_RADIUS); + lv_style_set_transition_prop_5(&list_btn, LV_STATE_DEFAULT, LV_STYLE_BG_OPA); + lv_style_set_transition_prop_6(&list_btn, LV_STATE_DEFAULT, LV_STYLE_BG_OPA); #endif } diff --git a/src/lv_widgets/lv_label.c b/src/lv_widgets/lv_label.c index 96e7a6f5f..d822998bf 100644 --- a/src/lv_widgets/lv_label.c +++ b/src/lv_widgets/lv_label.c @@ -1023,8 +1023,8 @@ static lv_design_res_t lv_label_design(lv_obj_t * label, const lv_area_t * clip_ else if(mode == LV_DESIGN_DRAW_MAIN) { lv_label_ext_t * ext = lv_obj_get_ext_attr(label); - lv_coord_t w = lv_obj_get_style_width(label, LV_LABEL_PART_MAIN); - lv_coord_t h = lv_obj_get_style_height(label, LV_LABEL_PART_MAIN); + lv_coord_t w = lv_obj_get_style_transform_width(label, LV_LABEL_PART_MAIN); + lv_coord_t h = lv_obj_get_style_transform_height(label, LV_LABEL_PART_MAIN); lv_area_t bg_coords; lv_area_copy(&bg_coords, &label->coords); bg_coords.x1 -= w;