From 6fd7bcf17222214d0da7392e2d68657a9cfa0a6b Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Mon, 10 Aug 2020 11:36:43 +0200 Subject: [PATCH] allow adding extra label to list buttons --- CHANGELOG.md | 1 + src/lv_widgets/lv_list.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87e94bb18..874bce62d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Fix text decor (udnerline strikethrough) with older versions of font converter - Fix setting local style property multiple times - Add missing background drawing and radius handling to image button +- Allow adding extra label to list buttons ## v7.3.0 (04.08.2020) diff --git a/src/lv_widgets/lv_list.c b/src/lv_widgets/lv_list.c index acb165a81..ecda79c9b 100644 --- a/src/lv_widgets/lv_list.c +++ b/src/lv_widgets/lv_list.c @@ -365,11 +365,11 @@ lv_obj_t * lv_list_get_btn_label(const lv_obj_t * btn) { LV_ASSERT_OBJ(btn, "lv_btn"); - lv_obj_t * label = lv_obj_get_child(btn, NULL); + lv_obj_t * label = lv_obj_get_child_back(btn, NULL); if(label == NULL) return NULL; while(lv_list_is_list_label(label) == false) { - label = lv_obj_get_child(btn, label); + label = lv_obj_get_child_back(btn, label); if(label == NULL) break; } @@ -386,11 +386,11 @@ lv_obj_t * lv_list_get_btn_img(const lv_obj_t * btn) LV_ASSERT_OBJ(btn, "lv_btn"); #if LV_USE_IMG != 0 - lv_obj_t * img = lv_obj_get_child(btn, NULL); + lv_obj_t * img = lv_obj_get_child_back(btn, NULL); if(img == NULL) return NULL; while(lv_list_is_list_img(img) == false) { - img = lv_obj_get_child(btn, img); + img = lv_obj_get_child_back(btn, img); if(img == NULL) break; }