From: tasn Date: Wed, 1 Jun 2011 14:25:11 +0000 (+0000) Subject: Evas textblock: Use advance when calculating line breaks and widths. X-Git-Tag: 2.0_alpha~240^2~524 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=111869425179b7b5dce8723badac85c1378a268b;p=framework%2Fuifw%2Fevas.git Evas textblock: Use advance when calculating line breaks and widths. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59870 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index c0a5d73..e562d80 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -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))) {