Merge 85b3e8766f into dev

CHANGELOG.md

@@ -10,6 +10,8 @@
 ### Bugfixes
 - fix(btnmatrix) handle arabic texts in button matrices
 - fix(indev) disabled object shouldn't absorb clicks but let the parent to be clicked
+- fix(arabic) support processing again already processed texts with _lv_txt_ap_proc
+- fix(textarea) support Arabic letter connections
 
 ## v7.7.2 (Planned to 17.11.2020)
 ### Bugfixes

src/lv_misc/lv_txt_ap.c

@@ -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;
 }

src/lv_widgets/lv_label.c

@@ -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 is NULL then just refresh with the current text */
-    if(text == NULL) {
+    if(text == NULL) text = ext->text;
-        lv_label_refr_text(label);
-        return;
-    }
 
     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);
 }
 
 /**