Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

feat(theme) add outline padding for the focused state in the default theme

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2021-04-19 10:04:08 +02:00
parent 0a10d45c51
commit ddea17afe2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/extra/themes/default/lv_theme_default.c
View File

@ -91,7 +91,7 @@ typedef struct {
#endif #endif
#if LV_USE_CHECKBOX #if LV_USE_CHECKBOX
lv_style_t cb_marker, cb_marker_checked, cb_bg_outline_pad; lv_style_t cb_marker, cb_marker_checked;
#endif #endif
#if LV_USE_SWITCH #if LV_USE_SWITCH
@ -256,6 +256,7 @@ static void style_init(void)
style_init_reset(&styles->outline_primary); style_init_reset(&styles->outline_primary);
lv_style_set_outline_color(&styles->outline_primary, color_primary_accent); lv_style_set_outline_color(&styles->outline_primary, color_primary_accent);
lv_style_set_outline_width(&styles->outline_primary, OUTLINE_WIDTH); lv_style_set_outline_width(&styles->outline_primary, OUTLINE_WIDTH);
lv_style_set_outline_pad(&styles->outline_primary, OUTLINE_WIDTH);
lv_style_set_outline_opa(&styles->outline_primary, LV_OPA_50); lv_style_set_outline_opa(&styles->outline_primary, LV_OPA_50);
style_init_reset(&styles->outline_secondary); style_init_reset(&styles->outline_secondary);
@ -399,9 +400,6 @@ static void style_init(void)
lv_style_set_bg_img_src(&styles->cb_marker_checked, LV_SYMBOL_OK); lv_style_set_bg_img_src(&styles->cb_marker_checked, LV_SYMBOL_OK);
lv_style_set_text_color(&styles->cb_marker_checked, lv_color_white()); lv_style_set_text_color(&styles->cb_marker_checked, lv_color_white());
lv_style_set_text_font(&styles->cb_marker_checked, theme.font_small); lv_style_set_text_font(&styles->cb_marker_checked, theme.font_small);
style_init_reset(&styles->cb_bg_outline_pad);
lv_style_set_outline_pad(&styles->cb_bg_outline_pad, LV_DPX(5));
#endif #endif
#if LV_USE_SWITCH #if LV_USE_SWITCH
@ -740,7 +738,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
else if(lv_obj_check_type(obj, &lv_checkbox_class)) { else if(lv_obj_check_type(obj, &lv_checkbox_class)) {
lv_obj_add_style(obj, &styles->pad_gap, 0); lv_obj_add_style(obj, &styles->pad_gap, 0);
lv_obj_add_style(obj, &styles->outline_primary, LV_STATE_FOCUS_KEY); lv_obj_add_style(obj, &styles->outline_primary, LV_STATE_FOCUS_KEY);
lv_obj_add_style(obj, &styles->cb_bg_outline_pad, LV_STATE_FOCUS_KEY);
lv_obj_add_style(obj, &styles->disabled, LV_PART_INDICATOR | LV_STATE_DISABLED); lv_obj_add_style(obj, &styles->disabled, LV_PART_INDICATOR | LV_STATE_DISABLED);
lv_obj_add_style(obj, &styles->cb_marker, LV_PART_INDICATOR); lv_obj_add_style(obj, &styles->cb_marker, LV_PART_INDICATOR);
lv_obj_add_style(obj, &styles->bg_color_primary, LV_PART_INDICATOR | LV_STATE_CHECKED); lv_obj_add_style(obj, &styles->bg_color_primary, LV_PART_INDICATOR | LV_STATE_CHECKED);