summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-11-25 14:39:14 +0000
committerTom Hacohen <tom@stosb.com>2013-11-25 14:44:48 +0000
commit87f99ee4123b69535d9f3a3ad3d9b73c86e6590c (patch)
tree9ad269608f47bdba1e0ee4f0905098343f16dd28
parentb538b4449571c95a55306369b9b645d396b07183 (diff)
Evas textblock: Fixed wrapping of lines ending with whites.
Whites at the end of lines ending with whites should not be cut, but should be wrapped (there's no legal line break there). Thanks to Shilpa Singh for reporting.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/canvas/evas_object_textblock.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b3041801..8d5456a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1375,3 +1375,7 @@
1375 1375
1376 * Evas textblock: Fixed order of tags inserted with markup_app/prepend. 1376 * Evas textblock: Fixed order of tags inserted with markup_app/prepend.
1377 1377
13782013-11-25 Tom Hacohen
1379
1380 * Evas textblock: Fixed wrapping of lines ending with whites.
1381
diff --git a/NEWS b/NEWS
index a82f6d07..bc2e7932 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes since Evas 1.7.9:
4------------------------- 4-------------------------
5Fixes: 5Fixes:
6 * Evas textblock: Fixed order of tags inserted with markup_app/prepend. 6 * Evas textblock: Fixed order of tags inserted with markup_app/prepend.
7 * Evas textblock: Fixed wrapping of lines ending with whites.
7 8
8Changes since Evas 1.7.8: 9Changes since Evas 1.7.8:
9------------------------- 10-------------------------
diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 7dda30df..b173b4f0 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -4172,7 +4172,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
4172 the rest works on the last char of the previous string. 4172 the rest works on the last char of the previous string.
4173 If it's a whitespace, then it's ok, and no need to go back 4173 If it's a whitespace, then it's ok, and no need to go back
4174 because we'll remove it anyway. */ 4174 because we'll remove it anyway. */
4175 if (!_is_white(str[wrap])) 4175 if (!_is_white(str[wrap]) || (wrap + 1 == len))
4176 MOVE_PREV_UNTIL(line_start, wrap); 4176 MOVE_PREV_UNTIL(line_start, wrap);
4177 /* If there's a breakable point inside the text, scan backwards until 4177 /* If there's a breakable point inside the text, scan backwards until
4178 * we find it */ 4178 * we find it */