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

refactor(txt) rename _lv_txt_get_width to lv_txt_get_width

Browse Source 
related to #2228
This commit is contained in:
Gabor Kiss-Vamosi
2021-05-04 14:27:55 +02:00
parent 87f8ac2ef9
commit 79d9f299ef
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/widgets/lv_label.c
View File

@@ -370,18 +370,18 @@ void lv_label_get_letter_pos(const lv_obj_t * obj, uint32_t char_id, lv_point_t
#endif
/*Calculate the x coordinate*/
lv_coord_t x = _lv_txt_get_width(bidi_txt, visual_byte_pos, font, letter_space, flag);
lv_coord_t x = lv_txt_get_width(bidi_txt, visual_byte_pos, font, letter_space, flag);
if(char_id != line_start) x += letter_space;
if(align == LV_TEXT_ALIGN_CENTER) {
lv_coord_t line_w;
line_w = _lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
line_w = lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
x += lv_area_get_width(&txt_coords) / 2 - line_w / 2;
}
else if(align == LV_TEXT_ALIGN_RIGHT) {
lv_coord_t line_w;
line_w = _lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
line_w = lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
x += lv_area_get_width(&txt_coords) - line_w;
}
@@ -455,12 +455,12 @@ uint32_t lv_label_get_letter_on(const lv_obj_t * obj, lv_point_t * pos_in)
lv_coord_t x = 0;
if(align == LV_TEXT_ALIGN_CENTER) {
lv_coord_t line_w;
line_w = _lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
line_w = lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
x += lv_area_get_width(&txt_coords) / 2 - line_w / 2;
}
else if(align == LV_TEXT_ALIGN_RIGHT) {
lv_coord_t line_w;
line_w = _lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
line_w = lv_txt_get_width(bidi_txt, new_line_start - line_start, font, letter_space, flag);
x += lv_area_get_width(&txt_coords) - line_w;
}
@@ -556,12 +556,12 @@ bool lv_label_is_char_under_pos(const lv_obj_t * obj, lv_point_t * pos)
lv_coord_t last_x = 0;
if(align == LV_TEXT_ALIGN_CENTER) {
lv_coord_t line_w;
line_w = _lv_txt_get_width(&txt[line_start], new_line_start - line_start, font, letter_space, flag);
line_w = lv_txt_get_width(&txt[line_start], new_line_start - line_start, font, letter_space, flag);
x += lv_area_get_width(&txt_coords) / 2 - line_w / 2;
}
else if(align == LV_TEXT_ALIGN_RIGHT) {
lv_coord_t line_w;
line_w = _lv_txt_get_width(&txt[line_start], new_line_start - line_start, font, letter_space, flag);
line_w = lv_txt_get_width(&txt[line_start], new_line_start - line_start, font, letter_space, flag);
x += lv_area_get_width(&txt_coords) - line_w;
}