From: tasn <tasn@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Date: Thu, 2 Jun 2011 14:02:31 +0000 (+0000)
Subject: Evas textblock: Fixed min size calculation with right aligned paragraphs.
X-Git-Tag: 2.0_alpha~240^2~516
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7529f2c499a9b5675b18e87183993fadebb00ddf;p=framework%2Fuifw%2Fevas.git

Evas textblock: Fixed min size calculation with right aligned paragraphs.

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

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index 604343c..7ccc369 100644
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -2479,16 +2479,16 @@ loop_advance:
         c->ln->x = c->marginl + c->o->style_pad.l;
      }
 
+   c->par->h = c->ln->y + c->ln->h;
+   if (c->ln->w > c->par->w)
+     c->par->w = c->ln->w;
+
      {
-        Evas_Coord new_wmax = c->ln->x + c->ln->w +
+        Evas_Coord new_wmax = c->par->w +
            c->marginl + c->marginr - (c->o->style_pad.l + c->o->style_pad.r);
         if (new_wmax > c->wmax)
            c->wmax = new_wmax;
      }
-
-   c->par->h = c->ln->y + c->ln->h;
-   if (c->ln->w + c->ln->x > c->par->w)
-     c->par->w = c->ln->x + c->ln->w;
 }
 
 /**