orbea
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Shilpa Singh 2015-10-19 11:12:23 -07:00 committed by Cedric BAIL
parent 0054ea9514
commit 924953591d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/edje/edje_calc.c
View File

@ -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;
}