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

lv_table: fix

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-11-29 10:02:34 +01:00
parent e7058e9135
commit 1e19574645
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lv_objx/lv_table.c
View File

@@ -160,6 +160,7 @@ void lv_table_set_cell_merge_right(lv_obj_t * table, uint16_t row, uint16_t col,
format.format_byte = ext->cell_data[cell][0]; format.format_byte = ext->cell_data[cell][0];
format.right_merge = en ? 1 : 0; format.right_merge = en ? 1 : 0;
ext->cell_data[cell][0] = format.format_byte; ext->cell_data[cell][0] = format.format_byte;
refr_size(table);
} }
@@ -445,10 +446,14 @@ static lv_coord_t get_row_height(lv_obj_t * table, uint16_t row_id)
} }
txt_w -= 2 * ext->cell_style->body.padding.hor; txt_w -= 2 * ext->cell_style->body.padding.hor;
printf("r:%d, c:%d, txt_w:%d\n", row_id, col, txt_w);
lv_txt_get_size(&txt_size, ext->cell_data[cell] + 1, ext->cell_style->text.font, lv_txt_get_size(&txt_size, ext->cell_data[cell] + 1, ext->cell_style->text.font,
ext->cell_style->text.letter_space, ext->cell_style->text.line_space, txt_w, LV_TXT_FLAG_NONE); ext->cell_style->text.letter_space, ext->cell_style->text.line_space, txt_w, LV_TXT_FLAG_NONE);
h_max = LV_MATH_MAX(txt_size.y, h_max); h_max = LV_MATH_MAX(txt_size.y, h_max);
cell += col_merge;
col += col_merge;
} }
} }