Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 05:26:18 +08:00
Code Issues Actions 82 Packages Projects Releases Wiki Activity

fix(font): allow non-constant LV_FONT_DEFAULT again (fixes #7788) (#8059)

Browse Source
This commit is contained in:
Niklas Fiekas
2025-04-10 13:22:59 +02:00
committed by GitHub
parent 65e831e61c
commit 9f090d2353
3 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/font/lv_font.c
+1 -3
View File
@@ -34,8 +34,6 @@
* GLOBAL VARIABLES * GLOBAL VARIABLES
**********************/ **********************/
const lv_font_t * const lv_font_default = LV_FONT_DEFAULT;
/********************** /**********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES
**********************/ **********************/
@@ -153,7 +151,7 @@ int32_t lv_font_get_line_height(const lv_font_t * font)
const lv_font_t * lv_font_get_default(void) const lv_font_t * lv_font_get_default(void)
{ {
return lv_font_default; return LV_FONT_DEFAULT;
} }
/********************** /**********************
src/font/lv_font.h
-5
View File
@@ -300,11 +300,6 @@ LV_FONT_DECLARE(lv_font_unscii_16)
LV_FONT_CUSTOM_DECLARE LV_FONT_CUSTOM_DECLARE
#endif #endif
/**
* Set to LV_FONT_DEFAULT as macros might not be available in bindings or other places
*/
extern const lv_font_t * const lv_font_default;
#ifdef __cplusplus #ifdef __cplusplus
} /*extern "C"*/ } /*extern "C"*/
#endif #endif
src/others/xml/lv_xml.c
+1 -1
View File
@@ -69,7 +69,7 @@ void lv_xml_init(void)
{ {
lv_xml_component_init(); lv_xml_component_init();
lv_xml_register_font(NULL, "lv_font_default", lv_font_default); lv_xml_register_font(NULL, "lv_font_default", lv_font_get_default());
lv_xml_widget_register("lv_obj", lv_xml_obj_create, lv_xml_obj_apply); lv_xml_widget_register("lv_obj", lv_xml_obj_create, lv_xml_obj_apply);
lv_xml_widget_register("lv_button", lv_xml_button_create, lv_xml_button_apply); lv_xml_widget_register("lv_button", lv_xml_button_create, lv_xml_button_apply);