Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

fix(layout): use uint16_t LV_LAYOUT_FLEX/GRID

Browse Source 
fixes #3273
This commit is contained in:
Gabor Kiss-Vamosi 2022-04-14 13:41:32 +02:00
parent 777fe1ea70
commit c596a36d9e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extra/layouts/flex/lv_flex.c
View File

@ -65,7 +65,7 @@ static lv_obj_t * get_next_item(lv_obj_t * cont, bool rev, int32_t * item_id);
/********************** /**********************
* GLOBAL VARIABLES * GLOBAL VARIABLES
**********************/ **********************/
uint32_t LV_LAYOUT_FLEX; uint16_t LV_LAYOUT_FLEX;
lv_style_prop_t LV_STYLE_FLEX_FLOW; lv_style_prop_t LV_STYLE_FLEX_FLOW;
lv_style_prop_t LV_STYLE_FLEX_MAIN_PLACE; lv_style_prop_t LV_STYLE_FLEX_MAIN_PLACE;
lv_style_prop_t LV_STYLE_FLEX_CROSS_PLACE; lv_style_prop_t LV_STYLE_FLEX_CROSS_PLACE;

2
src/extra/layouts/flex/lv_flex.h
View File

@ -57,7 +57,7 @@ typedef enum {
/********************** /**********************
* GLOBAL VARIABLES * GLOBAL VARIABLES
**********************/ **********************/
extern uint32_t LV_LAYOUT_FLEX; extern uint16_t LV_LAYOUT_FLEX;
extern lv_style_prop_t LV_STYLE_FLEX_FLOW; extern lv_style_prop_t LV_STYLE_FLEX_FLOW;
extern lv_style_prop_t LV_STYLE_FLEX_MAIN_PLACE; extern lv_style_prop_t LV_STYLE_FLEX_MAIN_PLACE;
extern lv_style_prop_t LV_STYLE_FLEX_CROSS_PLACE; extern lv_style_prop_t LV_STYLE_FLEX_CROSS_PLACE;

2
src/extra/layouts/grid/lv_grid.c
View File

@ -102,7 +102,7 @@ static inline uint8_t get_grid_row_align(lv_obj_t * obj)
/********************** /**********************
* GLOBAL VARIABLES * GLOBAL VARIABLES
**********************/ **********************/
uint32_t LV_LAYOUT_GRID; uint16_t LV_LAYOUT_GRID;
lv_style_prop_t LV_STYLE_GRID_COLUMN_DSC_ARRAY; lv_style_prop_t LV_STYLE_GRID_COLUMN_DSC_ARRAY;
lv_style_prop_t LV_STYLE_GRID_COLUMN_ALIGN; lv_style_prop_t LV_STYLE_GRID_COLUMN_ALIGN;
lv_style_prop_t LV_STYLE_GRID_ROW_DSC_ARRAY; lv_style_prop_t LV_STYLE_GRID_ROW_DSC_ARRAY;

2
src/extra/layouts/grid/lv_grid.h
View File

@ -53,7 +53,7 @@ typedef enum {
* GLOBAL VARIABLES * GLOBAL VARIABLES
**********************/ **********************/
extern uint32_t LV_LAYOUT_GRID; extern uint16_t LV_LAYOUT_GRID;
extern lv_style_prop_t LV_STYLE_GRID_COLUMN_DSC_ARRAY; extern lv_style_prop_t LV_STYLE_GRID_COLUMN_DSC_ARRAY;
extern lv_style_prop_t LV_STYLE_GRID_COLUMN_ALIGN; extern lv_style_prop_t LV_STYLE_GRID_COLUMN_ALIGN;
extern lv_style_prop_t LV_STYLE_GRID_ROW_DSC_ARRAY; extern lv_style_prop_t LV_STYLE_GRID_ROW_DSC_ARRAY;