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

Merge pull request #1370 from littlevgl/embeddedt-patch-1

Browse Source 
Ensure lv_ta_set_one_line doesn't change text alignment
This commit is contained in:
Gabor Kiss-Vamosi
2020-02-07 15:44:36 +01:00
committed by GitHub
parent 624a37c529 79a65213d6
commit 2cd3a5ac09
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lv_objx/lv_ta.c
View File

@@ -733,6 +733,7 @@ void lv_ta_set_one_line(lv_obj_t * ta, bool en)
lv_ta_ext_t * ext = lv_obj_get_ext_attr(ta); lv_ta_ext_t * ext = lv_obj_get_ext_attr(ta);
if(ext->one_line == en) return; if(ext->one_line == en) return;
lv_label_align_t old_align = lv_label_get_align(ext->label);
if(en) { if(en) {
const lv_style_t * style_ta = lv_obj_get_style(ta); const lv_style_t * style_ta = lv_obj_get_style(ta);
@@ -760,7 +761,8 @@ void lv_ta_set_one_line(lv_obj_t * ta, bool en)
} }
placeholder_update(ta); placeholder_update(ta);
refr_cursor_area(ta); /* `refr_cursor_area` is called at the end of lv_ta_set_text_align */
lv_ta_set_text_align(ta, old_align);
} }
/** /**