From 265218309a641d98682e4409b52d053c375be9a7 Mon Sep 17 00:00:00 2001 From: tasn Date: Sun, 12 Jun 2011 12:17:52 +0000 Subject: [PATCH] Edje min_restricted_calc: Fixed min height calculation for textblock. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@60239 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/edje_util.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c index 578fca3..e73e5eb 100644 --- a/src/lib/edje_util.c +++ b/src/lib/edje_util.c @@ -2284,6 +2284,18 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co (!((Edje_Part_Description_Text *)ep->chosen_description)->text.min_x) && (didw))) { + if ((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK)) + { + Evas_Coord tb_mh; + evas_object_textblock_size_formatted_get( + ep->object, NULL, &tb_mh); + tb_mh -= ep->req.h; + if (tb_mh > h) + { + h = tb_mh; + } + has_non_fixed_tb = EINA_TRUE; + } if (h > maxh) { maxh = h; @@ -2291,11 +2303,6 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co pep = ep; } } - - if (ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) - { - has_non_fixed_tb = EINA_TRUE; - } } } } -- 2.7.4