From b8557f2432a666f504a2f62b63bb5b587939da48 Mon Sep 17 00:00:00 2001 From: Gabor Kiss-Vamosi Date: Fri, 7 May 2021 21:53:45 +0200 Subject: [PATCH] fix(dropdown) fix list width calculation --- src/core/lv_obj.c | 2 +- src/widgets/lv_dropdown.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c index f8f5b0a8b..76931fa25 100644 --- a/src/core/lv_obj.c +++ b/src/core/lv_obj.c @@ -760,7 +760,7 @@ static void lv_obj_set_state(lv_obj_t * obj, lv_state_t new_state) if(lv_style_get_prop_inlined(obj_style->style, LV_STYLE_TRANSITION, &v) == false) continue; const lv_style_transition_dsc_t * tr = v.ptr; - /*Add the props t the set if not added yet or added but with smaller weight*/ + /*Add the props to the set if not added yet or added but with smaller weight*/ uint32_t j; for(j = 0; tr->props[j] != 0 && tsi < STYLE_TRANSITION_MAX; j++) { uint32_t t; diff --git a/src/widgets/lv_dropdown.c b/src/widgets/lv_dropdown.c index 6e5c6db1b..e84fdc4f0 100644 --- a/src/widgets/lv_dropdown.c +++ b/src/widgets/lv_dropdown.c @@ -424,13 +424,13 @@ void lv_dropdown_open(lv_obj_t * dropdown_obj) lv_label_set_text_static(label, dropdown->options); lv_obj_set_width(dropdown->list, LV_SIZE_CONTENT); + lv_obj_update_layout(label); /*Set smaller width to the width of the button*/ if(lv_obj_get_width(dropdown->list) <= lv_obj_get_width(dropdown_obj) && (dropdown->dir == LV_DIR_TOP || dropdown->dir == LV_DIR_BOTTOM)) { lv_obj_set_width(dropdown->list, lv_obj_get_width(dropdown_obj)); } - lv_obj_update_layout(label); lv_coord_t label_h = lv_obj_get_height(label); lv_coord_t top = lv_obj_get_style_pad_top(dropdown->list, LV_PART_MAIN); lv_coord_t bottom = lv_obj_get_style_pad_bottom(dropdown->list, LV_PART_MAIN);