From 7529f2c499a9b5675b18e87183993fadebb00ddf Mon Sep 17 00:00:00 2001 From: tasn Date: Thu, 2 Jun 2011 14:02:31 +0000 Subject: [PATCH] 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 --- src/lib/canvas/evas_object_textblock.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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; } /** -- 2.7.4