Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-20 21:35:19 +08:00
Code Issues Actions 48 Packages Projects Releases Wiki Activity

fix(layout): size in cross direction was not updated when layout on parent was changed from grid to flex (#8053)

Browse Source 
Co-authored-by: Fabian Zäh <Fabian.Zaeh@livetec.de>
Co-authored-by: Liam Howatt <30486941+liamHowatt@users.noreply.github.com>
This commit is contained in:
Fabian Zäh
2025-05-20 14:09:46 +02:00
committed by GitHub
parent 5a2cdf6ca3
commit 16acc2ef85
2 changed files with 99 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/layouts/flex/lv_flex.c
+8
View File
@@ -395,6 +395,10 @@ static void children_repos(lv_obj_t * cont, flex_t * f, int32_t item_first_id, i
item = get_next_item(cont, f->rev, &item_first_id);
continue;
}
uint16_t item_w_layout = item->w_layout;
uint16_t item_h_layout = item->h_layout;
int32_t grow_size = lv_obj_get_style_flex_grow(item, LV_PART_MAIN);
if(grow_size) {
int32_t s = 0;
@@ -430,6 +434,10 @@ static void children_repos(lv_obj_t * cont, flex_t * f, int32_t item_first_id, i
item->h_layout = 0;
}
if(item->w_layout != item_w_layout || item->h_layout != item_h_layout) {
lv_obj_mark_layout_as_dirty(item);
}
int32_t cross_pos = 0;
switch(f->cross_place) {
case LV_FLEX_ALIGN_CENTER:
tests/src/test_layout_switch.c
+91
View File
@@ -0,0 +1,91 @@
#if LV_BUILD_TEST
#include "../lvgl.h"
#include "../../lvgl_private.h"
#include "unity/unity.h"
#define NUM_OBJECTS 4
static lv_obj_t * active_screen = NULL;
static lv_obj_t * objects[NUM_OBJECTS] = {NULL};
static int32_t grid_col_dsc = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static int32_t grid_row_dsc = {LV_GRID_FR(1), LV_GRID_FR(1), LV_GRID_TEMPLATE_LAST};
static void set_layout_grid(void)
{
lv_obj_set_grid_dsc_array(active_screen, grid_col_dsc, grid_row_dsc);
lv_obj_set_grid_align(active_screen, LV_GRID_ALIGN_SPACE_BETWEEN, LV_GRID_ALIGN_SPACE_BETWEEN);
for(int i = 0; i < NUM_OBJECTS; i++) {
lv_obj_set_grid_cell(objects[i], LV_GRID_ALIGN_STRETCH, i % 2, 1, LV_GRID_ALIGN_STRETCH, i / 2, 1);
}
lv_obj_update_layout(active_screen);
}
static void set_layout_flex(lv_flex_flow_t flex_flow)
{
lv_obj_set_layout(active_screen, LV_LAYOUT_FLEX);
lv_obj_set_flex_flow(active_screen, flex_flow);
void (*obj_set_dimension)(lv_obj_t * obj, int32_t value) = NULL;
switch(flex_flow) {
case LV_FLEX_FLOW_COLUMN:
case LV_FLEX_FLOW_COLUMN_WRAP:
case LV_FLEX_FLOW_COLUMN_REVERSE:
case LV_FLEX_FLOW_COLUMN_WRAP_REVERSE:
obj_set_dimension = lv_obj_set_width;
break;
case LV_FLEX_FLOW_ROW:
case LV_FLEX_FLOW_ROW_WRAP:
case LV_FLEX_FLOW_ROW_REVERSE:
case LV_FLEX_FLOW_ROW_WRAP_REVERSE:
obj_set_dimension = lv_obj_set_height;
break;
default:
LV_LOG_ERROR("Invalid flex flow");
return;
}
for(int i = 0; i < NUM_OBJECTS; i++) {
lv_obj_set_flex_grow(objects[i], 1);
obj_set_dimension(objects[i], LV_PCT(100));
}
lv_obj_update_layout(active_screen);
}
void setUp(void)
{
active_screen = lv_screen_active();
for(int i = 0; i < NUM_OBJECTS; i++) {
objects[i] = lv_obj_create(active_screen);
}
}
void tearDown(void)
{
/* Function run after every test */
lv_obj_clean(lv_screen_active());
}
void test_layout_switch(void)
{
set_layout_flex(LV_FLEX_FLOW_COLUMN);
TEST_ASSERT_EQUAL(LV_LAYOUT_FLEX, lv_obj_get_style_layout(active_screen, LV_PART_MAIN));
TEST_ASSERT_EQUAL(1, active_screen->h_layout);
TEST_ASSERT_EQUAL(0, active_screen->w_layout);
set_layout_grid();
TEST_ASSERT_EQUAL(LV_LAYOUT_GRID, lv_obj_get_style_layout(active_screen, LV_PART_MAIN));
TEST_ASSERT_EQUAL(1, active_screen->h_layout);
TEST_ASSERT_EQUAL(1, active_screen->w_layout);
set_layout_flex(LV_FLEX_FLOW_ROW);
TEST_ASSERT_EQUAL(LV_LAYOUT_FLEX, lv_obj_get_style_layout(active_screen, LV_PART_MAIN));
TEST_ASSERT_EQUAL(0, active_screen->h_layout);
TEST_ASSERT_EQUAL(1, active_screen->w_layout);
}
#endif