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>

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index e2a662f..aa0728c 100644 (file)
--- 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,
    if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
        (ep->typedata.swallow))
      {
-        if (ep->typedata.swallow->swallow_params.min.w > desc->min.w)
+        if (ep->typedata.swallow->swallow_params.min.w > *minw)
           *minw = ep->typedata.swallow->swallow_params.min.w;
      }
 
@@ -2242,7 +2242,7 @@ _edje_part_recalc_single_min_max(FLOAT_T sc,
    if ((ep->type == EDJE_RP_TYPE_SWALLOW) &&
        (ep->typedata.swallow))
      {
-        if (ep->typedata.swallow->swallow_params.min.h > desc->min.h)
+        if (ep->typedata.swallow->swallow_params.min.h > *minh)
           *minh = ep->typedata.swallow->swallow_params.min.h;
      }