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

Revert "feat(tiny_ttf): add lv_font_* as paramater to lv_tiny_ttf_create" (#5327)

Browse Source 
Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
This commit is contained in:
_VIFEXTech
2024-01-15 20:33:44 +08:00
committed by GitHub
parent 9849f65254
commit 178789a937
7 changed files with 72 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/libs/tiny_ttf/lv_example_tiny_ttf_1.c
View File

@@ -9,14 +9,11 @@ void lv_example_tiny_ttf_1(void)
extern const uint8_t ubuntu_font[];
extern const int ubuntu_font_size;
static lv_font_t font;
lv_result_t res = lv_tiny_ttf_create_data(&font, ubuntu_font, ubuntu_font_size, 30);
if(res == LV_RESULT_INVALID) return;
/*Create style with the new font*/
static lv_style_t style;
lv_style_init(&style);
lv_style_set_text_font(&style, &font);
lv_font_t * font = lv_tiny_ttf_create_data(ubuntu_font, ubuntu_font_size, 30);
lv_style_set_text_font(&style, font);
lv_style_set_text_align(&style, LV_TEXT_ALIGN_CENTER);
/*Create a label with the new style*/

7
examples/libs/tiny_ttf/lv_example_tiny_ttf_2.c
View File

@@ -6,14 +6,11 @@
*/
void lv_example_tiny_ttf_2(void)
{
static lv_font_t font;
lv_result_t res = lv_tiny_ttf_create_file(&font, "A:lvgl/examples/libs/tiny_ttf/Ubuntu-Medium.ttf", 30);
if(res == LV_RESULT_INVALID) return;
/*Create style with the new font*/
static lv_style_t style;
lv_style_init(&style);
lv_style_set_text_font(&style, &font);
lv_font_t * font = lv_tiny_ttf_create_file("A:lvgl/examples/libs/tiny_ttf/Ubuntu-Medium.ttf", 30);
lv_style_set_text_font(&style, font);
lv_style_set_text_align(&style, LV_TEXT_ALIGN_CENTER);
/*Create a label with the new style*/

12
examples/libs/tiny_ttf/lv_example_tiny_ttf_3.c
View File

@@ -4,7 +4,7 @@
static void font_size_observer_cb(lv_observer_t * observer, lv_subject_t * subject);
static lv_subject_t subject_font;
static lv_font_t font;
/**
* Change font size with Tiny_TTF
*/
@@ -18,9 +18,8 @@ void lv_example_tiny_ttf_3(void)
/*Create style with the new font*/
static lv_style_t style;
lv_style_init(&style);
lv_result_t res = lv_tiny_ttf_create_data(&font, ubuntu_font, ubuntu_font_size, 25);
if(res == LV_RESULT_INVALID) return;
lv_style_set_text_font(&style, &font);
lv_font_t * font = lv_tiny_ttf_create_data(ubuntu_font, ubuntu_font_size, 25);
lv_style_set_text_font(&style, font);
lv_style_set_text_align(&style, LV_TEXT_ALIGN_CENTER);
lv_obj_t * slider = lv_slider_create(lv_screen_active());
@@ -46,9 +45,12 @@ void lv_example_tiny_ttf_3(void)
static void font_size_observer_cb(lv_observer_t * observer, lv_subject_t * subject)
{
lv_style_t * style = observer->user_data;
lv_style_value_t v;
lv_style_get_prop(style, LV_STYLE_TEXT_FONT, &v);
lv_font_t * font = (lv_font_t *) v.ptr;
int32_t size = lv_subject_get_int(subject);
lv_tiny_ttf_set_size(&font, size);
lv_tiny_ttf_set_size(font, size);
lv_obj_report_style_change(style);
}