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

edje calc no longer performs calculations for group parts of fixed size 

if the min/max of a part are identical and > 0, the part's min size is guaranteed
to be this size. there is no need to perform expensive recursive calcs here
This commit is contained in:
Mike Blumenkrantz 2015-03-31 19:07:46 -04:00
parent b72df468f2
commit 3a451650d2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3225,8 +3225,18 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta
(ep->typedata.swallow)) &&
ep->typedata.swallow->swallowed_object)
{
edje_object_size_min_calc(ep->typedata.swallow->swallowed_object,
&mmw, &mmh);
Edje_Size *min = NULL, *max = NULL;
if (ep->chosen_description)
{
min = &ep->chosen_description->min;
max = &ep->chosen_description->max;
}
if (min && max && (min->w == max->w) && (min->h == max->h))
mmw = min->w, mmh = min->h;
else
edje_object_size_min_calc(ep->typedata.swallow->swallowed_object,
&mmw, &mmh);
}
#ifdef EDJE_CALC_CACHE