aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-04-23 15:44:16 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-04-23 15:44:16 +0900
commit33a46372c956af1076dbed61e773e34f841f679e (patch)
treeb459eb078a6b694c0935b7eb3f7d09df7733fcf9
parentEo: add benchmarks to measure eo_add. (diff)
downloadefl-33a46372c956af1076dbed61e773e34f841f679e.tar.gz
Revert "ummm dont set max based on max hint... this got added at some point"
-rw-r--r--src/lib/edje/edje_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index a61010b253..27539da3d0 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) ||