Evas textblock: Fixed a bug in mixed wrapping mode.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@61440 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 34c4d0e..abbc611 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -3267,22 +3267,30 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
    /* If we need to find the position after the cutting point */
    if ((wrap == line_start) || (wrap_after))
      {
-        while (wrap < len)
+        if (mixed_wrap)
           {
-             if (ALLOW_BREAK(wrap))
-                break;
-             wrap++;
-          }
-
-
-        if ((wrap < len) && (wrap > line_start))
-          {
-             MOVE_NEXT_UNTIL(len, wrap);
-             return wrap;
+             return _layout_get_charwrap(c, fmt, ti,
+                   line_start, breaks);
           }
         else
           {
-             return -1;
+             while (wrap < len)
+               {
+                  if (ALLOW_BREAK(wrap))
+                     break;
+                  wrap++;
+               }
+
+
+             if ((wrap < len) && (wrap > line_start))
+               {
+                  MOVE_NEXT_UNTIL(len, wrap);
+                  return wrap;
+               }
+             else
+               {
+                  return -1;
+               }
           }
      }