Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

table: automatically expand row_cnt as needed

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-03-23 09:25:04 +01:00
parent c57aacafa2
commit 68b31008b7
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lv_misc/lv_mem.c
View File

@ -584,6 +584,7 @@ void * lv_memcpy(void * dst, const void * src, size_t len)
*/ */
void lv_memset(void * dst, uint8_t v, size_t len) void lv_memset(void * dst, uint8_t v, size_t len)
{ {
uint8_t * d8 = (uint8_t *) dst; uint8_t * d8 = (uint8_t *) dst;
uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK; uintptr_t d_align = (lv_uintptr_t) d8 & ALIGN_MASK;

48
src/lv_widgets/lv_table.c
View File

@ -134,10 +134,16 @@ void lv_table_set_cell_value(lv_obj_t * table, uint16_t row, uint16_t col, const
LV_ASSERT_NULL(txt); LV_ASSERT_NULL(txt);
lv_table_ext_t * ext = lv_obj_get_ext_attr(table); lv_table_ext_t * ext = lv_obj_get_ext_attr(table);
if(row >= ext->row_cnt || col >= ext->col_cnt) { if(col >= ext->col_cnt) {
LV_LOG_WARN("lv_table_set_cell_value: invalid row or column"); LV_LOG_WARN("lv_table_set_cell_value: invalid column");
return; return;
} }
/*Auto expand*/
if(row >= ext->row_cnt) {
lv_table_set_row_cnt(table, row + 1);
}
uint32_t cell = row * ext->col_cnt + col; uint32_t cell = row * ext->col_cnt + col;
lv_table_cell_format_t format; lv_table_cell_format_t format;
@ -268,10 +274,15 @@ void lv_table_set_cell_align(lv_obj_t * table, uint16_t row, uint16_t col, lv_la
LV_ASSERT_OBJ(table, LV_OBJX_NAME); LV_ASSERT_OBJ(table, LV_OBJX_NAME);
lv_table_ext_t * ext = lv_obj_get_ext_attr(table); lv_table_ext_t * ext = lv_obj_get_ext_attr(table);
if(row >= ext->row_cnt || col >= ext->col_cnt) { if(col >= ext->col_cnt) {
LV_LOG_WARN("lv_table_set_cell_align: invalid row or column"); LV_LOG_WARN("lv_table_set_cell_align: invalid column");
return; return;
} }
/*Auto expand*/
if(row >= ext->row_cnt) {
lv_table_set_row_cnt(table, row + 1);
}
uint32_t cell = row * ext->col_cnt + col; uint32_t cell = row * ext->col_cnt + col;
if(ext->cell_data[cell] == NULL) { if(ext->cell_data[cell] == NULL) {
@ -298,10 +309,16 @@ void lv_table_set_cell_type(lv_obj_t * table, uint16_t row, uint16_t col, uint8_
LV_ASSERT_OBJ(table, LV_OBJX_NAME); LV_ASSERT_OBJ(table, LV_OBJX_NAME);
lv_table_ext_t * ext = lv_obj_get_ext_attr(table); lv_table_ext_t * ext = lv_obj_get_ext_attr(table);
if(row >= ext->row_cnt || col >= ext->col_cnt) { if(col >= ext->col_cnt) {
LV_LOG_WARN("lv_table_set_cell_type: invalid row or column"); LV_LOG_WARN("lv_table_set_cell_type: invalid column");
return; return;
} }
/*Auto expand*/
if(row >= ext->row_cnt) {
lv_table_set_row_cnt(table, row + 1);
}
uint32_t cell = row * ext->col_cnt + col; uint32_t cell = row * ext->col_cnt + col;
if(ext->cell_data[cell] == NULL) { if(ext->cell_data[cell] == NULL) {
@ -333,10 +350,16 @@ void lv_table_set_cell_crop(lv_obj_t * table, uint16_t row, uint16_t col, bool c
LV_ASSERT_OBJ(table, LV_OBJX_NAME); LV_ASSERT_OBJ(table, LV_OBJX_NAME);
lv_table_ext_t * ext = lv_obj_get_ext_attr(table); lv_table_ext_t * ext = lv_obj_get_ext_attr(table);
if(row >= ext->row_cnt || col >= ext->col_cnt) { if( col >= ext->col_cnt) {
LV_LOG_WARN("lv_table_set_cell_crop: invalid row or column"); LV_LOG_WARN("lv_table_set_cell_crop: invalid column");
return; return;
} }
/*Auto expand*/
if(row >= ext->row_cnt) {
lv_table_set_row_cnt(table, row + 1);
}
uint32_t cell = row * ext->col_cnt + col; uint32_t cell = row * ext->col_cnt + col;
if(ext->cell_data[cell] == NULL) { if(ext->cell_data[cell] == NULL) {
@ -363,11 +386,16 @@ void lv_table_set_cell_merge_right(lv_obj_t * table, uint16_t row, uint16_t col,
LV_ASSERT_OBJ(table, LV_OBJX_NAME); LV_ASSERT_OBJ(table, LV_OBJX_NAME);
lv_table_ext_t * ext = lv_obj_get_ext_attr(table); lv_table_ext_t * ext = lv_obj_get_ext_attr(table);
if(row >= ext->row_cnt || col >= ext->col_cnt) { if(col >= ext->col_cnt) {
LV_LOG_WARN("lv_table_set_cell_merge_right: invalid row or column"); LV_LOG_WARN("lv_table_set_cell_merge_right: invalid column");
return; return;
} }
/*Auto expand*/
if(row >= ext->row_cnt) {
lv_table_set_row_cnt(table, row + 1);
}
uint32_t cell = row * ext->col_cnt + col; uint32_t cell = row * ext->col_cnt + col;
if(ext->cell_data[cell] == NULL) { if(ext->cell_data[cell] == NULL) {