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.

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 @@
+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
diff --git a/NEWS b/NEWS
index 9660f573c5..c7f0bb7c4f 100644
--- a/NEWS
+++ b/NEWS
@@ -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 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,
            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 */