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

fix(grid.h) typos (#2395)

Browse Source 
* fix(grid.h) typos

* grid:replace LV_COORD_MAX use LV_GRID_TEMPLATE_LAST

Co-authored-by: guowei15 <guowei15@xiaomi.com>
This commit is contained in:
guoweilkd
2021-07-23 17:52:09 +08:00
committed by GitHub
parent 4d43b99702
commit 7f9297879f
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/layouts/grid/lv_example_grid_1.c
View File

@@ -6,8 +6,8 @@
*/
void lv_example_grid_1(void)
{
static lv_coord_t col_dsc[] = {70, 70, 70, LV_COORD_MAX};
static lv_coord_t row_dsc[] = {50, 50, 50, LV_COORD_MAX};
static lv_coord_t col_dsc[] = {70, 70, 70, LV_GRID_TEMPLATE_LAST};
static lv_coord_t row_dsc[] = {50, 50, 50, LV_GRID_TEMPLATE_LAST};
/*Create a container with grid*/
lv_obj_t * cont = lv_obj_create(lv_scr_act());

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

@@ -734,7 +734,7 @@ static lv_coord_t grid_align(lv_coord_t cont_size, bool auto_size, uint8_t alig
static uint32_t count_tracks(const lv_coord_t * templ)
{
uint32_t i;
for(i = 0; templ[i] != LV_COORD_MAX; i++);
for(i = 0; templ[i] != LV_GRID_TEMPLATE_LAST; i++);
return i;
}

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

@@ -78,10 +78,10 @@ void lv_obj_set_grid_align(lv_obj_t * obj, lv_grid_align_t column_align, lv_grid
/**
* Set the cell of an object. The object's parent needs to have grid layout, else nothing will happen
* @param obj pointer to an object
* @param hor_place the vertical alignment in the cell. `LV_GRID_START/END/CENTER/STRETCH`
* @param column_align the vertical alignment in the cell. `LV_GRID_START/END/CENTER/STRETCH`
* @param col_pos column ID
* @param col_span number of columns to take (>= 1)
* @param ver_place the horizontal alignment in the cell. `LV_GRID_START/END/CENTER/STRETCH`
* @param row_align the horizontal alignment in the cell. `LV_GRID_START/END/CENTER/STRETCH`
* @param row_pos row ID
* @param row_span number of rows to take (>= 1)
*/