Evas: Fixed a bug with breaking after format items.

SVN revision: 82653

diff --git a/ChangeLog b/ChangeLog
index 44cbaaa..f02102a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2013-01-11  Tom Hacohen (TAsn)
 
        * Static libs: Updated liblinebreak to libunibreak's latest version.
+       * Evas texblock: Fixed a bug with breaking after format items.
 
 2013-01-11  Cedric Bail
 

diff --git a/NEWS b/NEWS
index 2186a38..abc29ea 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -108,3 +108,4 @@ Fixes:
     * Fix eina_prefix_new() with debian multilib without magic check file.
     * Fix evas bmp loader code which deal with image size.
     * Fix not up to date clip cache for Evas_Object_Text.
+    * Evas texblock: Fixed a bug with breaking after format items.

diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 36e9537..1f3342d 100644 (file)
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -4043,7 +4043,7 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
                }
 
 
-             if ((wrap < len) && (wrap > line_start))
+             if ((wrap < len) && (wrap >= line_start))
                {
                   MOVE_NEXT_UNTIL(len, wrap);
                   return wrap;
@@ -4454,10 +4454,13 @@ _layout_par(Ctxt *c)
                                     item_pos as the line_start, because
                                     there's already no cut before*/
                                  wrap = -1;
+                                 adv_line = 0;
                               }
-                        }
+                         }
                        else
-                          wrap -= it->text_pos; /* Cut here */
+                         {
+                            wrap -= it->text_pos; /* Cut here */
+                         }
                     }
 
                   if (wrap > 0)