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

fix(demo_music): remove font resource compilation dependencies (#3739)

Browse Source 
Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
This commit is contained in:
_VIFEXTech
2022-10-13 17:58:01 +08:00
committed by GitHub
parent 541b431546
commit 6a9f324a4f
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
demos/music/lv_demo_music_list.c
View File

@@ -52,12 +52,31 @@ LV_IMG_DECLARE(img_lv_demo_music_btn_list_pause);
lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent) lv_obj_t * _lv_demo_music_list_create(lv_obj_t * parent)
{ {
font_small = LV_FONT_DEFAULT;
font_medium = LV_FONT_DEFAULT;
#if LV_DEMO_MUSIC_LARGE #if LV_DEMO_MUSIC_LARGE
#if LV_FONT_MONTSERRAT_16
font_small = &lv_font_montserrat_16; font_small = &lv_font_montserrat_16;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_22
font_medium = &lv_font_montserrat_22; font_medium = &lv_font_montserrat_22;
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_22 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#else
#if LV_FONT_MONTSERRAT_12
font_small = &lv_font_montserrat_12; font_small = &lv_font_montserrat_12;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_12 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_16
font_medium = &lv_font_montserrat_16; font_medium = &lv_font_montserrat_16;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#endif #endif
lv_style_init(&style_scrollbar); lv_style_init(&style_scrollbar);

19
demos/music/lv_demo_music_main.c
View File

@@ -123,12 +123,31 @@ static void _obj_set_x_anim_cb(void * obj, int32_t x)
lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent) lv_obj_t * _lv_demo_music_main_create(lv_obj_t * parent)
{ {
font_small = LV_FONT_DEFAULT;
font_large = LV_FONT_DEFAULT;
#if LV_DEMO_MUSIC_LARGE #if LV_DEMO_MUSIC_LARGE
#if LV_FONT_MONTSERRAT_22
font_small = &lv_font_montserrat_22; font_small = &lv_font_montserrat_22;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_22 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_32
font_large = &lv_font_montserrat_32; font_large = &lv_font_montserrat_32;
#else #else
LV_LOG_WARN("LV_FONT_MONTSERRAT_32 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#else
#if LV_FONT_MONTSERRAT_12
font_small = &lv_font_montserrat_12; font_small = &lv_font_montserrat_12;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_12 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#if LV_FONT_MONTSERRAT_16
font_large = &lv_font_montserrat_16; font_large = &lv_font_montserrat_16;
#else
LV_LOG_WARN("LV_FONT_MONTSERRAT_16 is not enabled for the music demo. Using LV_FONT_DEFAULT instead.");
#endif
#endif #endif
/*Create the content of the music player*/ /*Create the content of the music player*/