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

Merge 85b3e8766f into dev

Browse Source
This commit is contained in:
github-actions[bot]
2020-11-21 22:53:52 +00:00
committed by GitHub
parent 216ba08676 85b3e8766f
commit 7ea3648a63
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/lv_misc/lv_txt_ap.c
View File

@@ -211,6 +211,13 @@ static uint32_t lv_ap_get_char_index(uint16_t c)
for(uint8_t i = 0; ap_chars_map[i].char_end_form; i++) {
if(c == (ap_chars_map[i].char_offset + LV_AP_ALPHABET_BASE_CODE))
return i;
else if (c == ap_chars_map[i].char_end_form //is it an End form
|| c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_begining_form_offset) //is it a Begining form
|| c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_middle_form_offset) //is it a middle form
|| c == (ap_chars_map[i].char_end_form + ap_chars_map[i].char_isolated_form_offset)) //is it an isolated form
{
return i;
}
}
return LV_UNDEF_ARABIC_PERSIAN_CHARS;
}

9
src/lv_widgets/lv_label.c
View File

@@ -151,11 +151,8 @@ void lv_label_set_text(lv_obj_t * label, const char * text)
lv_label_ext_t * ext = lv_obj_get_ext_attr(label);
/*If text is NULL then refresh */
if(text == NULL) {
lv_label_refr_text(label);
return;
}
/*If text is NULL then just refresh with the current text */
if(text == NULL) text = ext->text;
LV_ASSERT_STR(text);
@@ -928,7 +925,7 @@ void lv_label_ins_text(lv_obj_t * label, uint32_t pos, const char * txt)
#else
_lv_txt_ins(ext->text, pos, txt);
#endif
lv_label_refr_text(label);
lv_label_set_text(label, NULL);
}
/**