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

fix(btnmatrix): handle arabic texts in button matrices

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-11-17 12:12:19 +01:00
parent 6b99545e50
commit 4903bdb908
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -7,6 +7,9 @@
- add unscii-16 built-in font - add unscii-16 built-in font
- add KConfig - add KConfig
### Bugfixes
- fix(btnmatrix) handle arabic texts in button matrices
## v7.7.2 (Planned to 17.11.2020) ## v7.7.2 (Planned to 17.11.2020)
### Bugfixes ### Bugfixes
- fix(draw_triangle): fix polygon/triangle drawing when the order of points is counter-clockwise - fix(draw_triangle): fix polygon/triangle drawing when the order of points is counter-clockwise

18
src/lv_widgets/lv_btnmatrix.c
View File

@@ -680,6 +680,10 @@ static lv_design_res_t lv_btnmatrix_design(lv_obj_t * btnm, const lv_area_t * cl
lv_style_int_t padding_top = lv_obj_get_style_pad_top(btnm, LV_BTNMATRIX_PART_BG); lv_style_int_t padding_top = lv_obj_get_style_pad_top(btnm, LV_BTNMATRIX_PART_BG);
lv_style_int_t padding_bottom = lv_obj_get_style_pad_bottom(btnm, LV_BTNMATRIX_PART_BG); lv_style_int_t padding_bottom = lv_obj_get_style_pad_bottom(btnm, LV_BTNMATRIX_PART_BG);
#if LV_USE_ARABIC_PERSIAN_CHARS
const size_t txt_ap_size = 256 ;
char * txt_ap = _lv_mem_buf_get(txt_ap_size);
#endif
for(btn_i = 0; btn_i < ext->btn_cnt; btn_i++, txt_i++) { for(btn_i = 0; btn_i < ext->btn_cnt; btn_i++, txt_i++) {
/*Search the next valid text in the map*/ /*Search the next valid text in the map*/
while(strcmp(ext->map_p[txt_i], "\n") == 0) { while(strcmp(ext->map_p[txt_i], "\n") == 0) {
@@ -795,6 +799,16 @@ static lv_design_res_t lv_btnmatrix_design(lv_obj_t * btnm, const lv_area_t * cl
lv_style_int_t letter_space = draw_label_dsc_act->letter_space; lv_style_int_t letter_space = draw_label_dsc_act->letter_space;
lv_style_int_t line_space = draw_label_dsc_act->line_space; lv_style_int_t line_space = draw_label_dsc_act->line_space;
const char * txt = ext->map_p[txt_i]; const char * txt = ext->map_p[txt_i];
#if LV_USE_ARABIC_PERSIAN_CHARS
/*Get the size of the Arabic text and process it*/
size_t len_ap = _lv_txt_ap_calc_bytes_cnt(txt);
if(len_ap < txt_ap_size) {
_lv_txt_ap_proc(txt_ap, txt);
txt = txt_ap;
}
#endif
lv_point_t txt_size; lv_point_t txt_size;
_lv_txt_get_size(&txt_size, txt, font, letter_space, _lv_txt_get_size(&txt_size, txt, font, letter_space,
line_space, lv_area_get_width(&area_btnm), txt_flag); line_space, lv_area_get_width(&area_btnm), txt_flag);
@@ -806,6 +820,10 @@ static lv_design_res_t lv_btnmatrix_design(lv_obj_t * btnm, const lv_area_t * cl
lv_draw_label(&area_tmp, clip_area, draw_label_dsc_act, txt, NULL); lv_draw_label(&area_tmp, clip_area, draw_label_dsc_act, txt, NULL);
} }
#if LV_USE_ARABIC_PERSIAN_CHARS
_lv_mem_buf_release(txt_ap);
#endif
} }
else if(mode == LV_DESIGN_DRAW_POST) { else if(mode == LV_DESIGN_DRAW_POST) {
ancestor_design_f(btnm, clip_area, mode); ancestor_design_f(btnm, clip_area, mode);