Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-30 23:51:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(demos/widgets): add missing aligned font resource declarations (#8647)

Browse Source 
Signed-off-by: pengyiqiang <pengyiqiang@xiaomi.com>
Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
This commit is contained in:
VIFEX
2025-08-04 15:34:52 +08:00
committed by GitHub
parent 02c560cbe6
commit 8e046d3fba
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demos/widgets/lv_demo_widgets_components.c
+15 -6
View File
@@ -47,6 +47,15 @@ const lv_font_t * font_normal;
void lv_demo_widgets_components_init(void) void lv_demo_widgets_components_init(void)
{ {
#if LV_USE_DEMO_BENCHMARK && LV_DEMO_BENCHMARK_ALIGNED_FONTS
LV_FONT_DECLARE(lv_font_benchmark_montserrat_12_aligned)
LV_FONT_DECLARE(lv_font_benchmark_montserrat_14_aligned)
LV_FONT_DECLARE(lv_font_benchmark_montserrat_16_aligned)
LV_FONT_DECLARE(lv_font_benchmark_montserrat_18_aligned)
LV_FONT_DECLARE(lv_font_benchmark_montserrat_20_aligned)
LV_FONT_DECLARE(lv_font_benchmark_montserrat_24_aligned)
#define USE_ALIGNED_FONTS
#endif
if(LV_HOR_RES <= 320) disp_size = DISP_SMALL; if(LV_HOR_RES <= 320) disp_size = DISP_SMALL;
else if(LV_HOR_RES < 720) disp_size = DISP_MEDIUM; else if(LV_HOR_RES < 720) disp_size = DISP_MEDIUM;
@@ -56,14 +65,14 @@ void lv_demo_widgets_components_init(void)
font_normal = LV_FONT_DEFAULT; font_normal = LV_FONT_DEFAULT;
if(disp_size == DISP_LARGE) { if(disp_size == DISP_LARGE) {
#if LV_DEMO_BENCHMARK_ALIGNED_FONTS #ifdef USE_ALIGNED_FONTS
font_large = &lv_font_benchmark_montserrat_24_aligned; font_large = &lv_font_benchmark_montserrat_24_aligned;
#elif LV_FONT_MONTSERRAT_24 #elif LV_FONT_MONTSERRAT_24
font_large = &lv_font_montserrat_24; font_large = &lv_font_montserrat_24;
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_24 or LV_DEMO_BENCHMARK_ALIGNED_FONTS is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead."); LV_LOG_WARN("LV_FONT_MONTSERRAT_24 or LV_DEMO_BENCHMARK_ALIGNED_FONTS is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif #endif
#if LV_DEMO_BENCHMARK_ALIGNED_FONTS #ifdef USE_ALIGNED_FONTS
font_normal = &lv_font_benchmark_montserrat_16_aligned; font_normal = &lv_font_benchmark_montserrat_16_aligned;
#elif LV_FONT_MONTSERRAT_16 #elif LV_FONT_MONTSERRAT_16
font_normal = &lv_font_montserrat_16; font_normal = &lv_font_montserrat_16;
@@ -72,14 +81,14 @@ void lv_demo_widgets_components_init(void)
#endif #endif
} }
else if(disp_size == DISP_MEDIUM) { else if(disp_size == DISP_MEDIUM) {
#if LV_DEMO_BENCHMARK_ALIGNED_FONTS #ifdef USE_ALIGNED_FONTS
font_large = &lv_font_benchmark_montserrat_20_aligned; font_large = &lv_font_benchmark_montserrat_20_aligned;
#elif LV_FONT_MONTSERRAT_20 #elif LV_FONT_MONTSERRAT_20
font_large = &lv_font_montserrat_20; font_large = &lv_font_montserrat_20;
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_20 or LV_DEMO_BENCHMARK_ALIGNED_FONTS is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead."); LV_LOG_WARN("LV_FONT_MONTSERRAT_20 or LV_DEMO_BENCHMARK_ALIGNED_FONTS is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif #endif
#if LV_DEMO_BENCHMARK_ALIGNED_FONTS #ifdef USE_ALIGNED_FONTS
font_normal = &lv_font_benchmark_montserrat_14_aligned; font_normal = &lv_font_benchmark_montserrat_14_aligned;
#elif LV_FONT_MONTSERRAT_14 #elif LV_FONT_MONTSERRAT_14
font_normal = &lv_font_montserrat_14; font_normal = &lv_font_montserrat_14;
@@ -88,14 +97,14 @@ void lv_demo_widgets_components_init(void)
#endif #endif
} }
else { /* disp_size == DISP_SMALL */ else { /* disp_size == DISP_SMALL */
#if LV_DEMO_BENCHMARK_ALIGNED_FONTS #ifdef USE_ALIGNED_FONTS
font_large = &lv_font_benchmark_montserrat_18_aligned; font_large = &lv_font_benchmark_montserrat_18_aligned;
#elif LV_FONT_MONTSERRAT_18 #elif LV_FONT_MONTSERRAT_18
font_large = &lv_font_montserrat_18; font_large = &lv_font_montserrat_18;
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_18 or LV_DEMO_BENCHMARK_ALIGNED_FONTS is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead."); LV_LOG_WARN("LV_FONT_MONTSERRAT_18 or LV_DEMO_BENCHMARK_ALIGNED_FONTS is not enabled for the widgets demo. Using LV_FONT_DEFAULT instead.");
#endif #endif
#if LV_DEMO_BENCHMARK_ALIGNED_FONTS #ifdef USE_ALIGNED_FONTS
font_normal = &lv_font_benchmark_montserrat_12_aligned; font_normal = &lv_font_benchmark_montserrat_12_aligned;
#elif LV_FONT_MONTSERRAT_12 #elif LV_FONT_MONTSERRAT_12
font_normal = &lv_font_montserrat_12; font_normal = &lv_font_montserrat_12;