From de2f7effd97acb4232f0acdb05da7697b0f0c8f3 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Wed, 13 Dec 2023 15:36:24 +0100 Subject: [PATCH] fix(list): fix text style fixes #5005 --- src/widgets/list/lv_list.c | 9 +++++++-- tests/ref_imgs/widgets/list_1.png | Bin 5980 -> 6025 bytes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/widgets/list/lv_list.c b/src/widgets/list/lv_list.c index 7781e3e2fd..bc1ca05479 100644 --- a/src/widgets/list/lv_list.c +++ b/src/widgets/list/lv_list.c @@ -36,11 +36,15 @@ const lv_obj_class_t lv_list_class = { const lv_obj_class_t lv_list_button_class = { .base_class = &lv_button_class, + .width_def = LV_PCT(100), + .height_def = LV_SIZE_CONTENT, .name = "list-btn", }; const lv_obj_class_t lv_list_text_class = { .base_class = &lv_label_class, + .width_def = LV_PCT(100), + .height_def = LV_SIZE_CONTENT, .name = "list-text", }; @@ -68,7 +72,9 @@ lv_obj_t * lv_list_create(lv_obj_t * parent) lv_obj_t * lv_list_add_text(lv_obj_t * list, const char * txt) { LV_LOG_INFO("begin"); - lv_obj_t * obj = lv_label_create(list); + + lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_text_class, list); + lv_obj_class_init_obj(obj); lv_label_set_text(obj, txt); return obj; } @@ -78,7 +84,6 @@ lv_obj_t * lv_list_add_button(lv_obj_t * list, const void * icon, const char * t LV_LOG_INFO("begin"); lv_obj_t * obj = lv_obj_class_create_obj(&lv_list_button_class, list); lv_obj_class_init_obj(obj); - lv_obj_set_size(obj, LV_PCT(100), LV_SIZE_CONTENT); lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW); #if LV_USE_IMG == 1 diff --git a/tests/ref_imgs/widgets/list_1.png b/tests/ref_imgs/widgets/list_1.png index e75e1e5c183103a4ed942fdbdf7991ab25de71a2..a0ed3d7fd29a8fa6685705070c679daaf5708d56 100644 GIT binary patch literal 6025 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 literal 5980 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