summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShilpa Singh <shilpa.singh@samsung.com>2015-10-19 11:12:23 -0700
committerCedric BAIL <cedric@osg.samsung.com>2015-10-19 11:12:26 -0700
commit924953591d89820ad129e0d4a06544f606cf5c0e (patch)
tree3e148dc2b2684efa0a57db3eac0fc28058900360
parent0054ea9514bb44a67ddaaabe4e0f213f8b3d934e (diff)
edje: comparision with non-scaled min values issue fix.
Summary: In a different scaling environment, wrong comparison of min values causes resize issue as original size is compared instead of scaled size. Signed-off-by: Shilpa Singh <shilpa.singh@samsung.com> Signed-off-by: Subodh Kumar <s7158.kumar@samsung.com> @fix Test Plan: Create a layout with some min size and swallow a resizable layout inside the layout. the parent layout will not expand even when the height has crossed its min size. Reviewers: cedric, tasn, raster Subscribers: subodh6129 Differential Revision: https://phab.enlightenment.org/D3185 Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
-rw-r--r--src/lib/edje/edje_calc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index e2a662fb6b..aa0728c9a4 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2177,7 +2177,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
2177 if ((ep->type == EDJE_RP_TYPE_SWALLOW) && 2177 if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
2178 (ep->typedata.swallow)) 2178 (ep->typedata.swallow))
2179 { 2179 {
2180 if (ep->typedata.swallow->swallow_params.min.w > desc->min.w) 2180 if (ep->typedata.swallow->swallow_params.min.w > *minw)
2181 *minw = ep->typedata.swallow->swallow_params.min.w; 2181 *minw = ep->typedata.swallow->swallow_params.min.w;
2182 } 2182 }
2183 2183
@@ -2242,7 +2242,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
2242 if ((ep->type == EDJE_RP_TYPE_SWALLOW) && 2242 if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
2243 (ep->typedata.swallow)) 2243 (ep->typedata.swallow))
2244 { 2244 {
2245 if (ep->typedata.swallow->swallow_params.min.h > desc->min.h) 2245 if (ep->typedata.swallow->swallow_params.min.h > *minh)
2246 *minh = ep->typedata.swallow->swallow_params.min.h; 2246 *minh = ep->typedata.swallow->swallow_params.min.h;
2247 } 2247 }
2248 2248