From d9933843b6519831466a253c2ef7e635009d44ff Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 20 Sep 2005 05:49:22 +0000 Subject: [PATCH] handle textblock fixed with and variable height as a result formatting with min size calcs SVN revision: 16780 --- legacy/edje/src/lib/edje_util.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index 2bc43dab26..a01047f4fa 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -860,10 +860,12 @@ edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) { Edje_Real_Part *ep; int w, h; + int didw; ep = l->data; w = ep->w - ep->req.w; h = ep->h - ep->req.h; + didw = 0; if (!((ep->chosen_description) && (ep->chosen_description->fixed.w))) { @@ -872,16 +874,22 @@ edje_object_size_min_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh) maxw = w; ok = 1; pep = ep; + didw = 1; } } if (!((ep->chosen_description) && (ep->chosen_description->fixed.h))) { - if (h > maxh) + if (!((ep->part->type == EDJE_PART_TYPE_TEXTBLOCK) && + (!ep->chosen_description->text.min_x) && + (didw))) { - maxh = h; - ok = 1; - pep = ep; + if (h > maxh) + { + maxh = h; + ok = 1; + pep = ep; + } } } }