summaryrefslogtreecommitdiff
path: root/src/lib/evas
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@datenfreihafen.org>2020-09-01 13:00:33 +0200
committerStefan Schmidt <stefan@datenfreihafen.org>2020-09-01 13:00:33 +0200
commit173b3a108e1b2093ac37650619a61568aaed4e04 (patch)
tree75ffde851837e91b660c9334454f248ef0d79bac /src/lib/evas
parent6e025575350276a0f43ffc33ade696e6bffca395 (diff)
Revert "evas_textblock: rainbow flag emoji treated as two clusters(update unibreak to version 4.2)"
This reverts commit 1ab71284db89dcc37da12dd56796e892bc50ae0a. We are in freeze.
Diffstat (limited to 'src/lib/evas')
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index aacc251b1b..45fc1a0028 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -10291,7 +10291,7 @@ evas_textblock_cursor_word_start(Efl_Text_Cursor_Handle *cur)
10291 if ((cur->pos > 0) && (cur->pos == len)) 10291 if ((cur->pos > 0) && (cur->pos == len))
10292 cur->pos--; 10292 cur->pos--;
10293 10293
10294 for (i = cur->pos ; _is_white(text[i]) ; i--) 10294 for (i = cur->pos ; _is_white(text[i]) && BREAK_AFTER(i) ; i--)
10295 { 10295 {
10296 if (i == 0) 10296 if (i == 0)
10297 { 10297 {
@@ -10358,7 +10358,7 @@ evas_textblock_cursor_word_end(Efl_Text_Cursor_Handle *cur)
10358 set_wordbreaks_utf32((const utf32_t *) text, len, lang, breaks); 10358 set_wordbreaks_utf32((const utf32_t *) text, len, lang, breaks);
10359 } 10359 }
10360 10360
10361 for (i = cur->pos; text[i] && _is_white(text[i]) ; i++); 10361 for (i = cur->pos; text[i] && _is_white(text[i]) && (BREAK_AFTER(i)) ; i++);
10362 if (i == len) 10362 if (i == len)
10363 { 10363 {
10364 Evas_Object_Textblock_Node_Text *nnode; 10364 Evas_Object_Textblock_Node_Text *nnode;