diff --git a/examples/widgets/btn/lv_example_btn_2.c b/examples/widgets/btn/lv_example_btn_2.c index 2b085bbd6e..ff5c761005 100644 --- a/examples/widgets/btn/lv_example_btn_2.c +++ b/examples/widgets/btn/lv_example_btn_2.c @@ -6,50 +6,54 @@ */ void lv_example_btn_2(void) { - static lv_style_transition_dsc_t trans; - static lv_style_prop_t props[] = {LV_STYLE_OUTLINE_WIDTH, LV_STYLE_OUTLINE_OPA, 0}; - lv_style_transition_dsc_init(&trans, props, lv_anim_path_linear, 300, 0); - + /*Init the style for the default state*/ static lv_style_t style; lv_style_init(&style); + + lv_style_set_radius(&style, 3); + + lv_style_set_bg_opa(&style, LV_OPA_100); + lv_style_set_bg_color(&style, lv_palette_main(LV_PALETTE_BLUE)); + lv_style_set_bg_grad_color(&style, lv_palette_darken(LV_PALETTE_BLUE, 2)); + lv_style_set_bg_grad_dir(&style, LV_GRAD_DIR_VER); + + lv_style_set_border_opa(&style, LV_OPA_40); + lv_style_set_border_width(&style, 2); + lv_style_set_border_color(&style, lv_palette_main(LV_PALETTE_GREY)); + + lv_style_set_shadow_width(&style, 8); + lv_style_set_shadow_color(&style, lv_palette_main(LV_PALETTE_GREY)); + lv_style_set_shadow_ofs_y(&style, 8); + lv_style_set_outline_opa(&style, LV_OPA_COVER); lv_style_set_outline_color(&style, lv_palette_main(LV_PALETTE_BLUE)); - static lv_style_t style_pr; - lv_style_init(&style_pr); - lv_style_set_outline_width(&style_pr, 30); - lv_style_set_outline_opa(&style_pr, LV_OPA_TRANSP); - lv_style_set_transition(&style_pr, &trans); - -// -// /*Init the default style*/ -// lv_style_set_radius(&style, 3); -// -// lv_style_set_bg_opa(&style, LV_OPA_100); -// lv_style_set_bg_color(&style, lv_palette_main(LV_PALETTE_BLUE)); -// lv_style_set_bg_grad_color(&style, lv_color_blue_darken_2()); -// lv_style_set_bg_grad_dir(&style, LV_GRAD_DIR_VER); -// -// lv_style_set_border_opa(&style, LV_OPA_40); -// lv_style_set_border_width(&style, 2); -// lv_style_set_border_color(&style, lv_palette_main(LV_PALETTE_GREY)); -// -// lv_style_set_shadow_width(&style, 8); -// lv_style_set_shadow_color(&style, lv_palette_main(LV_PALETTE_GREY)); -// lv_style_set_shadow_ofs_y(&style, 8); -// -// lv_style_set_text_color(&style, lv_color_white()); -// -// lv_style_set_pad_all(&style, 10); -// lv_style_set_pad_all(&style_pr, 40); + lv_style_set_text_color(&style, lv_color_white()); + lv_style_set_pad_all(&style, 10); /*Init the pressed style*/ + static lv_style_t style_pr; + lv_style_init(&style_pr); + + /*Ad a large outline when pressed*/ + lv_style_set_outline_width(&style_pr, 30); + lv_style_set_outline_opa(&style_pr, LV_OPA_TRANSP); + + lv_style_set_translate_y(&style_pr, 5); lv_style_set_shadow_ofs_y(&style_pr, 3); lv_style_set_bg_color(&style_pr, lv_palette_darken(LV_PALETTE_BLUE, 2)); lv_style_set_bg_grad_color(&style_pr, lv_palette_darken(LV_PALETTE_BLUE, 4)); + /*Add a transition to the the outline*/ + static lv_style_transition_dsc_t trans; + static lv_style_prop_t props[] = {LV_STYLE_OUTLINE_WIDTH, LV_STYLE_OUTLINE_OPA, 0}; + lv_style_transition_dsc_init(&trans, props, lv_anim_path_linear, 300, 0); + trans.user_data = &trans; + + lv_style_set_transition(&style_pr, &trans); + lv_obj_t * btn1 = lv_btn_create(lv_scr_act()); -// lv_obj_remove_style(btn1, LV_PART_ANY, LV_STATE_ANY, NULL); + lv_obj_remove_style_all(btn1); /*Remove the style coming from the theme*/ lv_obj_add_style(btn1, &style, 0); lv_obj_add_style(btn1, &style_pr, LV_STATE_PRESSED); lv_obj_set_size(btn1, LV_SIZE_CONTENT, LV_SIZE_CONTENT); diff --git a/src/core/lv_obj_style.c b/src/core/lv_obj_style.c index 171fffc8fa..a7c7397240 100644 --- a/src/core/lv_obj_style.c +++ b/src/core/lv_obj_style.c @@ -369,6 +369,8 @@ _lv_style_state_cmp_t _lv_obj_style_state_compare(lv_obj_t * obj, lv_state_t sta else if(lv_style_get_prop(style, LV_STYLE_PAD_COLUMN, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; else if(lv_style_get_prop(style, LV_STYLE_PAD_ROW, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; else if(lv_style_get_prop(style, LV_STYLE_LAYOUT, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; + else if(lv_style_get_prop(style, LV_STYLE_TRANSLATE_X, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; + else if(lv_style_get_prop(style, LV_STYLE_TRANSLATE_Y, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; else if(lv_style_get_prop(style, LV_STYLE_WIDTH, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; else if(lv_style_get_prop(style, LV_STYLE_HEIGHT, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; else if(lv_style_get_prop(style, LV_STYLE_MIN_WIDTH, &v)) res_tmp = _LV_STYLE_STATE_CMP_DIFF_LAYOUT; diff --git a/src/misc/lv_style.h b/src/misc/lv_style.h index 1fff85e61a..609676d635 100644 --- a/src/misc/lv_style.h +++ b/src/misc/lv_style.h @@ -122,8 +122,8 @@ typedef enum { LV_STYLE_CLIP_CORNER = 2, LV_STYLE_TRANSFORM_WIDTH = 3 | LV_STYLE_PROP_EXT_DRAW, LV_STYLE_TRANSFORM_HEIGHT = 4 | LV_STYLE_PROP_EXT_DRAW, - LV_STYLE_TRANSLATE_X = 5 | LV_STYLE_PROP_PARENT_LAYOUT_REFR, - LV_STYLE_TRANSLATE_Y = 6 | LV_STYLE_PROP_PARENT_LAYOUT_REFR, + LV_STYLE_TRANSLATE_X = 5 | LV_STYLE_PROP_LAYOUT_REFR | LV_STYLE_PROP_PARENT_LAYOUT_REFR, + LV_STYLE_TRANSLATE_Y = 6 | LV_STYLE_PROP_LAYOUT_REFR | LV_STYLE_PROP_PARENT_LAYOUT_REFR, LV_STYLE_TRANSFORM_ZOOM = 7 | LV_STYLE_PROP_EXT_DRAW, LV_STYLE_TRANSFORM_ANGLE = 8 | LV_STYLE_PROP_EXT_DRAW, LV_STYLE_OPA = 9 | LV_STYLE_PROP_INHERIT,