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

bidi: minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2019-10-09 15:36:38 +02:00
parent 0257fbcd5a
commit 7a0728fc3c
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/lv_misc/lv_bidi.c
View File

@@ -115,8 +115,8 @@ bool lv_bidi_letter_is_weak(uint32_t letter)
bool lv_bidi_letter_is_rtl(uint32_t letter)
{
// if(letter >= 0x7f && letter <= 0x2000) return true;
if(letter >= 0x5d0 && letter <= 0x5ea) return true;
if(letter == 0x202E) return true; /*Unicode of LV_BIDI_RLO*/
// if(letter >= 'a' && letter <= 'z') return true;
return false;
@@ -159,7 +159,7 @@ static void process_paragraph(const char * str_in, char * str_out, uint32_t len,
while(rd < len) {
uint32_t letter = lv_txt_encoded_next(str_in, &rd);
dir = lv_bidi_get_letter_dir(letter);
if(dir != LV_BIDI_DIR_NEUTRAL) break;
if(dir != LV_BIDI_DIR_NEUTRAL && dir != LV_BIDI_DIR_WEAK) break;
}
if(rd && str_in[rd] != '\0') lv_txt_encoded_prev(str_in, &rd);
@@ -170,7 +170,7 @@ static void process_paragraph(const char * str_in, char * str_out, uint32_t len,
wr += rd;
} else {
wr -= rd;
memcpy(&str_out[wr], str_in, rd);
rtl_reverse(&str_out[wr], str_in, rd);
}
memcpy(print_buf, str_in, rd);
print_buf[rd] = '\0';
@@ -230,7 +230,7 @@ static lv_bidi_dir_t get_next_run(const char * txt, lv_bidi_dir_t base_dir, uint
letter = lv_txt_encoded_next(txt, NULL);
lv_bidi_dir_t dir = lv_bidi_get_letter_dir(letter);
/*Find the first strong char. Skip the neutrals.*/
/*Find the first strong char. Skip the neutrals*/
while(dir == LV_BIDI_DIR_NEUTRAL || dir == LV_BIDI_DIR_WEAK) {
letter = lv_txt_encoded_next(txt, &i);
dir = lv_bidi_get_letter_dir(letter);

4
src/lv_misc/lv_bidi.h
View File

@@ -25,6 +25,10 @@ extern "C" {
/*********************
* DEFINES
*********************/
/* Special non printable strong characters.
* They can be inserted to texts to affect the run's direction*/
#define LV_BIDI_LRO "\xE2\x80\xAD" /*U+202D*/
#define LV_BIDI_RLO "\xE2\x80\xAE" /*U+202E*/
/**********************
* TYPEDEFS

2
src/lv_objx/lv_label.c
View File

@@ -186,7 +186,7 @@ void lv_label_set_text(lv_obj_t * label, const char * text)
lv_label_refr_text(label);
#else
lv_bidi_dir_t base_dir = lv_obj_get_base_dir(label);
if(base_dir == LV_BIDI_DIR_AUTO) base_dir = lv_bidi_detect_base_dir(text);
if(base_dir == LV_BIDI_DIR_AUTO) base_dir = lv_bidi_detect_base_dir(ext->text_ori);
lv_bidi_process(ext->text_ori, ext->text, base_dir);
lv_label_refr_text(label);