From 87cee2f72bc4d5ac7ab279ab19d74010884e6566 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 26 Feb 2021 13:13:37 +0100 Subject: [PATCH] minor fixes --- src/lv_core/lv_theme.h | 14 ++++---------- tests/build.py | 42 ++++++------------------------------------ 2 files changed, 10 insertions(+), 46 deletions(-) diff --git a/src/lv_core/lv_theme.h b/src/lv_core/lv_theme.h index 56452ca47..07afdd65e 100644 --- a/src/lv_core/lv_theme.h +++ b/src/lv_core/lv_theme.h @@ -47,17 +47,11 @@ typedef struct _lv_theme_t { **********************/ /** - * Set a theme for the system. - * From now, all the created objects will use styles from this theme by default - * @param th pointer to theme (return value of: 'lv_theme_init_xxx()') + * Get the theme assigned to the display of the object + * @param obj pointer to object + * @return the theme of the object's display (can be NULL) */ -void lv_theme_set_act(lv_theme_t * th); - -/** - * Get the current system theme. - * @return pointer to the current system theme. NULL if not set. - */ -lv_theme_t * lv_theme_get_act(void); +lv_theme_t * lv_theme_get_from_obj(lv_obj_t * obj); /** * Apply the active theme on an object diff --git a/tests/build.py b/tests/build.py index 5a428e879..c843b6485 100755 --- a/tests/build.py +++ b/tests/build.py @@ -72,16 +72,9 @@ minimal_monochrome = { "LV_USE_ARABIC_PERSIAN_CHARS":0, "LV_BUILD_EXAMPLES":1, + + "LV_FONT_DEFAULT":"\\\"&lv_font_montserrat_14\\\"", -# "LV_USE_THEME_MONO":1, -# "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"", -# "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", -# "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", -# "LV_THEME_DEFAULT_FLAG" : "0", -# "LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_unscii_8\\\"", } @@ -108,16 +101,9 @@ minimal_16bit = { "LV_USE_ARABIC_PERSIAN_CHARS":0, "LV_BUILD_EXAMPLES":1, + + "LV_FONT_DEFAULT":"\\\"&lv_font_montserrat_14\\\"", -# "LV_USE_THEME_MONO":1, -# "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"", -# "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", -# "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", -# "LV_THEME_DEFAULT_FLAG" : "0", -# "LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_unscii_8\\\"", } minimal_16bit_swap = { @@ -146,15 +132,7 @@ minimal_16bit_swap = { "LV_BUILD_EXAMPLES":1, -# "LV_USE_THEME_MONO":1, -# "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"", -# "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", -# "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", -# "LV_THEME_DEFAULT_FLAG" : "0", -# "LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_unscii_8\\\"", + "LV_FONT_DEFAULT":"\\\"&lv_font_montserrat_14\\\"", } @@ -217,15 +195,7 @@ full_32bit = { "LV_BUILD_EXAMPLES":1, -# "LV_USE_THEME_MONO":1, -# "LV_THEME_DEFAULT_INIT": "\\\"lv_theme_mono_init\\\"", -# "LV_THEME_DEFAULT_COLOR_PRIMARY": "\\\"LV_COLOR_RED\\\"", -# "LV_THEME_DEFAULT_COLOR_SECONDARY": "\\\"LV_COLOR_BLUE\\\"", -# "LV_THEME_DEFAULT_FLAG" : "0", -# "LV_THEME_DEFAULT_FONT_SMALL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_NORMAL" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_SUBTITLE" : "\\\"&lv_font_unscii_8\\\"", -# "LV_THEME_DEFAULT_FONT_TITLE" : "\\\"&lv_font_unscii_8\\\"", + "LV_FONT_DEFAULT":"\\\"&lv_font_montserrat_32\\\"", } build("Minimal config monochrome", minimal_monochrome)