Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-09-23 22:42:01 +08:00
Code Issues Actions 42 Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-03-16 12:28:25 +01:00
parent d93056cd43
commit ef5b2c695b
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extra/themes/default/lv_theme_default.c
+4 -4
View File
@@ -38,8 +38,8 @@ static lv_color_t color_secondary_muted;// lv_color_indigo_lighten_5()
#define BORDER_WIDTH LV_DPX(2)
#define OUTLINE_WIDTH LV_DPX(2)
#define PAD_DEF (disp_size == DISP_LARGE ? LV_DPX(24) : LV_DPX(12))
#define PAD_SMALL (PAD_DEF / 2 + 2)
#define PAD_DEF (disp_size == DISP_LARGE ? LV_DPX(24) : disp_size == DISP_MEDIUM ? LV_DPX(20) : LV_DPX(16))
#define PAD_SMALL (disp_size == DISP_LARGE ? LV_DPX(14) : disp_size == DISP_MEDIUM ? LV_DPX(12) : LV_DPX(12))
/**********************
* TYPEDEFS
@@ -524,7 +524,7 @@ lv_theme_t * lv_theme_default_init(lv_disp_t * disp, lv_color_palette_t palette_
styles = (my_theme_styles_t *)LV_GC_ROOT(_lv_theme_default_styles);
}
if(LV_HOR_RES <= 240) disp_size = DISP_SMALL;
if(LV_HOR_RES <= 320) disp_size = DISP_SMALL;
else if(LV_HOR_RES <= 800) disp_size = DISP_MEDIUM;
else disp_size = DISP_LARGE;
@@ -824,7 +824,7 @@ static void theme_apply(lv_theme_t * th, lv_obj_t * obj)
#if LV_USE_KEYBOARD
else if(lv_obj_check_type(obj, &lv_keyboard_class)) {
lv_obj_add_style(obj, LV_PART_MAIN, LV_STATE_DEFAULT, &styles->scr);
lv_obj_add_style(obj, LV_PART_MAIN, LV_STATE_DEFAULT, &styles->pad_small);
lv_obj_add_style(obj, LV_PART_MAIN, LV_STATE_DEFAULT, &styles->pad_zero);
lv_obj_add_style(obj, LV_PART_MAIN, LV_STATE_FOCUS_KEY, &styles->outline_primary);
lv_obj_add_style(obj, LV_PART_MAIN, LV_STATE_EDITED, &styles->outline_secondary);
lv_obj_add_style(obj, LV_PART_ITEMS, LV_STATE_DEFAULT, &styles->btn);
src/lv_hal/lv_hal_disp.h
-7
View File
@@ -177,13 +177,6 @@ typedef struct _lv_disp_t {
uint32_t last_activity_time; /**< Last time when there was activity on this display */
} lv_disp_t;
typedef enum {
LV_DISP_SIZE_SMALL,
LV_DISP_SIZE_MEDIUM,
LV_DISP_SIZE_LARGE,
LV_DISP_SIZE_EXTRA_LARGE,
} lv_disp_size_t;
/**********************
* GLOBAL PROTOTYPES
**********************/