From: Carsten Haitzler (Rasterman) Date: Tue, 23 Apr 2013 06:44:16 +0000 (+0900) Subject: Revert "ummm dont set max based on max hint... this got added at some point" X-Git-Tag: submit/devel/efl/20131022.203902~1203 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33a46372c956af1076dbed61e773e34f841f679e;p=platform%2Fupstream%2Fefl.git Revert "ummm dont set max based on max hint... this got added at some point" This reverts commit 116013320a941357a925441928ea7e10ed6c0ebd. --- diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index a61010b..27539da 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -6287,10 +6287,10 @@ _edje_real_part_swallow_hints_update(Edje_Real_Part *rp) edje_object_size_min_get(rp->typedata.swallow->swallowed_object, &w, &h); rp->typedata.swallow->swallow_params.min.w = w; rp->typedata.swallow->swallow_params.min.h = h; +#endif edje_object_size_max_get(rp->typedata.swallow->swallowed_object, &w, &h); rp->typedata.swallow->swallow_params.max.w = w; rp->typedata.swallow->swallow_params.max.h = h; -#endif } else if (eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_TEXT_CLASS) || eo_isa(rp->typedata.swallow->swallowed_object, EVAS_OBJ_POLYGON_CLASS) ||