diff --git a/examples/others/xml/lv_example_xml_2.c b/examples/others/xml/lv_example_xml_2.c index 61e36a8de..65fb37e38 100644 --- a/examples/others/xml/lv_example_xml_2.c +++ b/examples/others/xml/lv_example_xml_2.c @@ -15,6 +15,8 @@ void lv_example_xml_2(void) lv_xml_component_register_from_file("A:lvgl/examples/others/xml/my_button.xml"); lv_xml_component_register_from_file("A:lvgl/examples/others/xml/view.xml"); + lv_xml_register_font("lv_montserrat_18", &lv_font_montserrat_18); + lv_obj_t * obj = lv_xml_create(lv_screen_active(), "view", NULL); lv_obj_set_pos(obj, 10, 10); diff --git a/examples/widgets/canvas/lv_example_canvas_10.c b/examples/widgets/canvas/lv_example_canvas_10.c index 7252ca8a7..0b666109b 100644 --- a/examples/widgets/canvas/lv_example_canvas_10.c +++ b/examples/widgets/canvas/lv_example_canvas_10.c @@ -19,7 +19,7 @@ static void timer_cb(lv_timer_t * timer) lv_draw_letter_dsc_t letter_dsc; lv_draw_letter_dsc_init(&letter_dsc); letter_dsc.color = lv_color_hex(0xff0000); - letter_dsc.font = lv_font_default(); + letter_dsc.font = lv_font_get_default(); { #define CURVE2_X(t) ((t) * 2 + lv_trigo_cos((t) * 5) * 40 / 32767 - 10) diff --git a/examples/widgets/canvas/lv_example_canvas_9.c b/examples/widgets/canvas/lv_example_canvas_9.c index 0d297940e..e85210e09 100644 --- a/examples/widgets/canvas/lv_example_canvas_9.c +++ b/examples/widgets/canvas/lv_example_canvas_9.c @@ -19,7 +19,7 @@ static void timer_cb(lv_timer_t * timer) lv_draw_letter_dsc_t letter_dsc; lv_draw_letter_dsc_init(&letter_dsc); letter_dsc.color = lv_color_hex(0xff0000); - letter_dsc.font = lv_font_default(); + letter_dsc.font = lv_font_get_default(); { #define CURVE2_X(t) (t * 2 + 10) diff --git a/src/font/lv_font.c b/src/font/lv_font.c index 52e588646..3d9afcb5c 100644 --- a/src/font/lv_font.c +++ b/src/font/lv_font.c @@ -146,9 +146,10 @@ int32_t lv_font_get_line_height(const lv_font_t * font) return font->line_height; } -const lv_font_t * lv_font_default(void) + +const lv_font_t * lv_font_get_default(void) { - return LV_FONT_DEFAULT; + return lv_font_default; } /********************** diff --git a/src/font/lv_font.h b/src/font/lv_font.h index 62c39c62a..fa9f3649f 100644 --- a/src/font/lv_font.h +++ b/src/font/lv_font.h @@ -174,6 +174,12 @@ int32_t lv_font_get_line_height(const lv_font_t * font); */ void lv_font_set_kerning(lv_font_t * font, lv_font_kerning_t kerning); +/** + * Get the default font, defined by LV_FONT_DEFAULT + * @return return pointer to the default font + */ +const lv_font_t * lv_font_get_default(void); + /********************** * MACROS **********************/ diff --git a/src/others/xml/parsers/lv_xml_table_parser.c b/src/others/xml/parsers/lv_xml_table_parser.c index 28183e373..0d96c5256 100644 --- a/src/others/xml/parsers/lv_xml_table_parser.c +++ b/src/others/xml/parsers/lv_xml_table_parser.c @@ -119,7 +119,7 @@ void lv_xml_table_cell_apply(lv_xml_parser_state_t * state, const char ** attrs) lv_strncpy(buf, value, sizeof(buf)); char * buf_p = buf; const char * str; - while((str = lv_xml_split_str(&buf_p, ' ')) != NULL) { + while((str = lv_xml_split_str(&buf_p, '|')) != NULL) { ctrl |= table_ctrl_to_enum(str); } diff --git a/tests/ref_imgs/xml/view2.png b/tests/ref_imgs/xml/view2.png new file mode 100644 index 000000000..621d70f41 Binary files /dev/null and b/tests/ref_imgs/xml/view2.png differ diff --git a/tests/ref_imgs_vg_lite/xml/view2.png b/tests/ref_imgs_vg_lite/xml/view2.png new file mode 100644 index 000000000..f6bd171d5 Binary files /dev/null and b/tests/ref_imgs_vg_lite/xml/view2.png differ diff --git a/tests/src/test_assets/xml/view2.xml b/tests/src/test_assets/xml/view2.xml new file mode 100644 index 000000000..5bcfceccc --- /dev/null +++ b/tests/src/test_assets/xml/view2.xml @@ -0,0 +1,35 @@ + + + + + + + +