diff options
author | Tom Hacohen <tom@stosb.com> | 2013-11-25 14:39:14 +0000 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2013-11-25 14:41:24 +0000 |
commit | f0d3cb91b37075e177809b27dedc10b4f507d76e (patch) | |
tree | 5422f1d942aa1d866aa53e17dac3c2e7b5a8a51f | |
parent | ada27a49d7100f336b9751b2c390fb14ccfe6a04 (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-- | ChangeLog | 4 | ||||
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 2 |
3 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2013-11-25 Tom Hacohen + + * Evas textblock: Fixed wrapping of lines ending with whites. + 2013-11-25 ChunEon Park (Hermet) * Evas: Fix proxy render to update the proxies recursively. If a proxy @@ -363,6 +363,7 @@ Fixes: - Fixed the textblock set to context with the textblock object's render operation. - Evas textblock: Fixed order of tags inserted with markup_app/prepend. - Fix proxy render to update the proxies recursively. If a proxy has proxies, all the chainged proxies should be updated recursively. + - Evas textblock: Fixed wrapping of lines ending with whites. * Ecore: - 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 7077120d9..2c6c8f370 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, the rest works on the last char of the previous string. If it's a whitespace, then it's ok, and no need to go back because we'll remove it anyway. */ - if (!_is_white(str[wrap])) + if (!_is_white(str[wrap]) || (wrap + 1 == len)) MOVE_PREV_UNTIL(line_start, wrap); /* If there's a breakable point inside the text, scan backwards until * we find it */ |