diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-27 07:30:02 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-27 07:30:02 (GMT) |
| commit | 6ef63b0f3c687126805635510f0d2f0ed8eb76b8 (patch) | |
| tree | fceebd15b2d96776f1427ac28ccfd8e103e9d5b3 /src/libs | |
| parent | 4bead413bbbb3e9c59d2030e02fdd5a80b66ae79 (diff) | |
Revert "Revert "Test neofont1 in theme""
This reverts commit 7c21234cd3c2e008e10ac210bb5acf45f8c51f93.
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/lv_conf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index c1af42d..73b2d50 100644 --- a/src/libs/lv_conf.h +++ b/src/libs/lv_conf.h @@ -413,7 +413,8 @@ typedef void* lv_indev_drv_user_data_t; /*Type of user data in the in * LV_FONT_DECLARE(my_font_2) */ -#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont2) \ +#define LV_FONT_CUSTOM_DECLARE LV_FONT_DECLARE(neofont1) \ + LV_FONT_DECLARE(neofont2) \ LV_FONT_DECLARE(lv_font_sys_48) /* Enable it if you have fonts with a lot of characters. @@ -474,7 +475,7 @@ typedef void* lv_font_user_data_t; #define LV_THEME_DEFAULT_COLOR_PRIMARY lv_color_hex(0xffffff) #define LV_THEME_DEFAULT_COLOR_SECONDARY lv_color_hex(0xaaaaaa) #define LV_THEME_DEFAULT_FLAG 0//LV_THEME_MATERIAL_FLAG_DARK -#define LV_THEME_DEFAULT_FONT_SMALL &neofont2 +#define LV_THEME_DEFAULT_FONT_SMALL &neofont1 #define LV_THEME_DEFAULT_FONT_NORMAL &neofont2 #define LV_THEME_DEFAULT_FONT_SUBTITLE &neofont2 #define LV_THEME_DEFAULT_FONT_TITLE &neofont2 |