Flex fixes. Layout now is a dict:

layout:
        type: flex
        flex_align_cross: center
        flex_align_main: space_between

      layout:
        type: grid
        grid_rows: 2
        grid_columns: 2
        grid_column_align: space_evenly
This commit is contained in:
clydebarrow 2024-05-13 16:11:39 +10:00
parent c771182630
commit 012ae633c0
2 changed files with 9 additions and 2 deletions

View File

@ -806,7 +806,9 @@ LAYOUT_SCHEMA = {
cv.Optional(df.CONF_GRID_ROW_ALIGN): grid_alignments,
},
df.TYPE_FLEX: {
cv.Optional(df.CONF_FLEX_FLOW): df.FLEX_FLOWS.one_of,
cv.Optional(
df.CONF_FLEX_FLOW, default="row_wrap"
): df.FLEX_FLOWS.one_of,
cv.Optional(df.CONF_FLEX_ALIGN_MAIN, default="start"): flex_alignments,
cv.Optional(df.CONF_FLEX_ALIGN_CROSS, default="start"): flex_alignments,
cv.Optional(df.CONF_FLEX_ALIGN_TRACK, default="start"): flex_alignments,
@ -826,7 +828,7 @@ GRID_CELL_SCHEMA = {
}
FLEX_OBJ_SCHEMA = {
cv.Optional(df.CONF_FLEX_GROW, default=1): cv.int_,
cv.Optional(df.CONF_FLEX_GROW): cv.int_,
}

View File

@ -162,6 +162,8 @@ lvgl:
type: grid
grid_rows: 2
grid_columns: 2
grid_column_align: space_evenly
grid_row_align: center
checkable: true
widgets:
- label:
@ -416,6 +418,9 @@ lvgl:
layout:
type: flex
flex_flow: column_wrap
flex_align_main: space_evenly
flex_align_cross: center
flex_align_track: start
align: CENTER
src: cat_image
id: img_id