Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-28 22:30:49 +08:00
Code Issues Actions 59 Packages Projects Releases Wiki Activity

fix(grid, flex) fix alignment on LV_SIZE_CONTENT containers

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-05-05 20:59:35 +02:00
parent c3c8aca38b
commit 4056f60fa9
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/extra/layouts/flex/lv_flex.c
+3 -2
View File
@@ -146,8 +146,9 @@ static void flex_update(lv_obj_t * cont, void * user_data)
lv_coord_t w_set = lv_obj_get_style_width(cont, LV_PART_MAIN); lv_coord_t w_set = lv_obj_get_style_width(cont, LV_PART_MAIN);
lv_coord_t h_set = lv_obj_get_style_height(cont, LV_PART_MAIN); lv_coord_t h_set = lv_obj_get_style_height(cont, LV_PART_MAIN);
if((f.row && h_set == LV_SIZE_CONTENT) || /*Content sized objects should squeezed the gap between the children, therefore any alignment will look like `START`*/
(!f.row && w_set == LV_SIZE_CONTENT)) if((f.row && h_set == LV_SIZE_CONTENT && cont->h_layout == 0) ||
(!f.row && w_set == LV_SIZE_CONTENT && cont->w_layout == 0))
{ {
track_cross_place = LV_FLEX_ALIGN_START; track_cross_place = LV_FLEX_ALIGN_START;
} }
src/extra/layouts/grid/lv_grid.c
+2 -2
View File
@@ -207,11 +207,11 @@ static void calc(struct _lv_obj_t * cont, _lv_grid_calc_t * calc_out)
lv_coord_t w_set = lv_obj_get_style_width(cont, LV_PART_MAIN); lv_coord_t w_set = lv_obj_get_style_width(cont, LV_PART_MAIN);
lv_coord_t h_set = lv_obj_get_style_height(cont, LV_PART_MAIN); lv_coord_t h_set = lv_obj_get_style_height(cont, LV_PART_MAIN);
bool auto_w = w_set == LV_SIZE_CONTENT ? true : false; bool auto_w = (w_set == LV_SIZE_CONTENT && !cont->w_layout) ? true : false;
lv_coord_t cont_w = lv_obj_get_content_width(cont); lv_coord_t cont_w = lv_obj_get_content_width(cont);
calc_out->grid_w = grid_align(cont_w, auto_w, get_grid_col_align(cont), col_gap, calc_out->col_num, calc_out->w, calc_out->x, rev); calc_out->grid_w = grid_align(cont_w, auto_w, get_grid_col_align(cont), col_gap, calc_out->col_num, calc_out->w, calc_out->x, rev);
bool auto_h = h_set == LV_SIZE_CONTENT ? true : false; bool auto_h = (h_set == LV_SIZE_CONTENT && !cont->h_layout) ? true : false;
lv_coord_t cont_h = lv_obj_get_content_height(cont); lv_coord_t cont_h = lv_obj_get_content_height(cont);
calc_out->grid_h = grid_align(cont_h, auto_h, get_grid_row_align(cont), row_gap, calc_out->row_num, calc_out->h, calc_out->y, false); calc_out->grid_h = grid_align(cont_h, auto_h, get_grid_row_align(cont), row_gap, calc_out->row_num, calc_out->h, calc_out->y, false);