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

Merge b3bfa3c58b into dev

Browse Source
This commit is contained in:
github-actions[bot]
2020-10-26 11:02:04 +00:00
committed by GitHub
parent 9d7ba3fcb1 b3bfa3c58b
commit 54a8a4ba33
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lv_widgets/lv_label.c
View File

@@ -1383,13 +1383,22 @@ static void lv_label_refr_text(lv_obj_t * label)
}
else {
lv_point_t p;
lv_coord_t y_overed;
p.x = lv_area_get_width(&txt_coords) -
(lv_font_get_glyph_width(font, '.', '.') + letter_space) *
LV_LABEL_DOT_NUM; /*Shrink with dots*/
p.y = lv_area_get_height(&txt_coords);
p.y -= p.y %
(lv_font_get_line_height(font) + line_space); /*Round down to the last line*/
p.y -= line_space; /*Trim the last line space*/
y_overed = p.y %
(lv_font_get_line_height(font) + line_space); /*Round down to the last line*/
if (y_overed >= lv_font_get_line_height(font)) {
p.y -= y_overed;
p.y += lv_font_get_line_height(font);
}
else {
p.y -= y_overed;
p.y -= line_space;
}
uint32_t letter_id = lv_label_get_letter_on(label, &p);