tasn pushed a commit to branch evas-1.7. http://git.enlightenment.org/legacy/evas.git/commit/?id=87f99ee4123b69535d9f3a3ad3d9b73c86e6590c
commit 87f99ee4123b69535d9f3a3ad3d9b73c86e6590c Author: Tom Hacohen <t...@stosb.com> Date: Mon Nov 25 14:39:14 2013 +0000 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. --- ChangeLog | 4 ++++ NEWS | 1 + src/lib/canvas/evas_object_textblock.c | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b304180..8d5456a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1375,3 +1375,7 @@ * Evas textblock: Fixed order of tags inserted with markup_app/prepend. +2013-11-25 Tom Hacohen + + * Evas textblock: Fixed wrapping of lines ending with whites. + diff --git a/NEWS b/NEWS index a82f6d0..bc2e793 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,7 @@ Changes since Evas 1.7.9: ------------------------- Fixes: * Evas textblock: Fixed order of tags inserted with markup_app/prepend. + * Evas textblock: Fixed wrapping of lines ending with whites. Changes since Evas 1.7.8: ------------------------- diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 7dda30d..b173b4f 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, 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 */ --