Evas textblock: Use advance when calculating line breaks and widths.
authortasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 1 Jun 2011 14:25:11 +0000 (14:25 +0000)
committertasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 1 Jun 2011 14:25:11 +0000 (14:25 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59870 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/canvas/evas_object_textblock.c

index c0a5d73..e562d80 100644 (file)
@@ -2446,7 +2446,7 @@ loop_advance:
         it->x = x;
         x += it->adv;
 
-        if ((it->x + it->w) > c->ln->w) c->ln->w = it->x + it->w;
+        if ((it->x + it->adv) > c->ln->w) c->ln->w = it->x + it->adv;
      }
 
    c->ln->y = (c->y - c->par->y) + c->o->style_pad.t;
@@ -3519,7 +3519,7 @@ _layout_visualize_par(Ctxt *c)
         /* Check if we need to wrap, i.e the text is bigger than the width,
            or we already found a wrap point. */
         if ((c->w >= 0) &&
-              (((c->x + it->w) >
+              (((c->x + it->adv) >
                 (c->w - c->o->style_pad.l - c->o->style_pad.r -
                  c->marginl - c->marginr)) || (wrap > 0)))
           {