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

fix(flex): don't count item gap for leading hidden items (#7720)

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2025-02-08 04:40:04 +01:00
committed by GitHub
parent b504294613
commit b9e0c4daaf
4 changed files with 69 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
tests/ref_imgs/flex_hide_items.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
tests/ref_imgs_vg_lite/flex_hide_items.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

67
tests/src/test_cases/test_align_flex.c
View File

@@ -81,7 +81,6 @@ void test_align(void)
/*See https://github.com/lvgl/lvgl/issues/7035*/
void test_wrap_grow_min_width(void)
{
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_ROW_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_SPACE_EVENLY);
@@ -106,4 +105,70 @@ void test_wrap_grow_min_width(void)
TEST_ASSERT_EQUAL_SCREENSHOT("flex_wrap_grow_min_width.png");
}
static lv_obj_t * cont_row_5_create(void)
{
lv_obj_t * cont = lv_obj_create(lv_screen_active());
lv_obj_set_size(cont, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
lv_obj_center(cont);
lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_ROW);
for(int i = 0; i < 5; i++) {
lv_obj_t * btn = lv_button_create(cont);
lv_obj_set_size(btn, 40, 60);
lv_obj_t * label = lv_label_create(btn);
lv_label_set_text_fmt(label, "%d", i);
lv_obj_center(label);
}
return cont;
}
static void hide(lv_obj_t * cont, uint32_t idx)
{
lv_obj_add_flag(lv_obj_get_child(cont, idx), LV_OBJ_FLAG_HIDDEN);
}
void test_flex_hide_items(void)
{
lv_obj_set_flex_flow(lv_screen_active(), LV_FLEX_FLOW_COLUMN_WRAP);
lv_obj_set_flex_align(lv_screen_active(), LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_SPACE_EVENLY);
lv_obj_t * cont;
cont = cont_row_5_create();
cont = cont_row_5_create();
hide(cont, 0);
cont = cont_row_5_create();
hide(cont, 0);
hide(cont, 1);
cont = cont_row_5_create();
hide(cont, 4);
cont = cont_row_5_create();
hide(cont, 3);
hide(cont, 4);
cont = cont_row_5_create();
hide(cont, 0);
hide(cont, 1);
hide(cont, 3);
hide(cont, 4);
cont = cont_row_5_create();
hide(cont, 1);
hide(cont, 3);
cont = cont_row_5_create();
hide(cont, 0);
hide(cont, 4);
TEST_ASSERT_EQUAL_SCREENSHOT("flex_hide_items.png");
}
#endif