summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d9561d1c43..3fb6084ab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-11-25 Tom Hacohen
2
3 * Evas textblock: Fixed wrapping of lines ending with whites.
4
12013-11-25 ChunEon Park (Hermet) 52013-11-25 ChunEon Park (Hermet)
2 6
3 * Evas: Fix proxy render to update the proxies recursively. If a proxy 7 * Evas: Fix proxy render to update the proxies recursively. If a proxy
diff --git a/NEWS b/NEWS
index 9660f573c5..c7f0bb7c4f 100644
--- a/NEWS
+++ b/NEWS
@@ -363,6 +363,7 @@ Fixes:
363 - Fixed the textblock set to context with the textblock object's render operation. 363 - Fixed the textblock set to context with the textblock object's render operation.
364 - Evas textblock: Fixed order of tags inserted with markup_app/prepend. 364 - Evas textblock: Fixed order of tags inserted with markup_app/prepend.
365 - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively. 365 - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively.
366 - Evas textblock: Fixed wrapping of lines ending with whites.
366 367
367 * Ecore: 368 * Ecore:
368 - Don't leak fd on exec. 369 - Don't leak fd on exec.
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 7077120d9f..2c6c8f3706 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -4256,7 +4256,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
4256 the rest works on the last char of the previous string. 4256 the rest works on the last char of the previous string.
4257 If it's a whitespace, then it's ok, and no need to go back 4257 If it's a whitespace, then it's ok, and no need to go back
4258 because we'll remove it anyway. */ 4258 because we'll remove it anyway. */
4259 if (!_is_white(str[wrap])) 4259 if (!_is_white(str[wrap]) || (wrap + 1 == len))
4260 MOVE_PREV_UNTIL(line_start, wrap); 4260 MOVE_PREV_UNTIL(line_start, wrap);
4261 /* If there's a breakable point inside the text, scan backwards until 4261 /* If there's a breakable point inside the text, scan backwards until
4262 * we find it */ 4262 * we find it */