github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(theme): make the basic theme even more simpler

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2022-03-12 18:50:19 +01:00
parent 44f6f75238
commit 62d6f3c533
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/lv_obj.c
View File

@@ -41,7 +41,6 @@
#define MY_CLASS &lv_obj_class
#define LV_OBJ_DEF_WIDTH (LV_DPX(100))
#define LV_OBJ_DEF_HEIGHT (LV_DPX(50))
#define GRID_DEBUG 0 /*Draw rectangles on grid cells*/
#define STYLE_TRANSITION_MAX 32
/**********************

6
src/extra/themes/basic/lv_theme_basic.c
View File

@@ -89,7 +89,6 @@ static void style_init(void)
lv_style_set_arc_width(&styles->white, 2);
lv_style_set_arc_color(&styles->white, COLOR_WHITE);
style_init_reset(&styles->light);
lv_style_set_bg_opa(&styles->light, LV_OPA_COVER);
lv_style_set_bg_color(&styles->light, COLOR_LIGHT);
@@ -224,20 +223,17 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
#if LV_USE_MSGBOX
if(lv_obj_check_type(lv_obj_get_parent(obj), &lv_msgbox_class)) {
lv_obj_add_style(obj, &styles->light, LV_PART_ITEMS);
lv_obj_add_style(obj, &styles->dark, LV_PART_ITEMS | LV_STATE_PRESSED);
return;
}
#endif
#if LV_USE_TABVIEW
if(lv_obj_check_type(lv_obj_get_parent(obj), &lv_tabview_class)) {
lv_obj_add_style(obj, &styles->light, LV_PART_ITEMS);
lv_obj_add_style(obj, &styles->dark, LV_PART_ITEMS | LV_STATE_PRESSED);
return;
}
#endif
lv_obj_add_style(obj, &styles->white, 0);
lv_obj_add_style(obj, &styles->light, LV_PART_ITEMS);
lv_obj_add_style(obj, &styles->dark, LV_PART_ITEMS | LV_STATE_PRESSED);
}
#endif
@@ -273,7 +269,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
#if LV_USE_SWITCH
else if(lv_obj_check_type(obj, &lv_switch_class)) {
lv_obj_add_style(obj, &styles->light, 0);
lv_obj_add_style(obj, &styles->dark, LV_PART_INDICATOR | LV_STATE_CHECKED);
lv_obj_add_style(obj, &styles->dim, LV_PART_KNOB);
}
#endif
@@ -356,7 +351,6 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
#if LV_USE_CALENDAR
else if(lv_obj_check_type(obj, &lv_calendar_class)) {
lv_obj_add_style(obj, &styles->light, 0);
lv_obj_add_style(obj, &styles->light, LV_PART_ITEMS | LV_STATE_PRESSED);
}
#endif