diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-03-31 23:27:01 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2015-03-31 23:31:11 -0400 |
| commit | 15f8d943aaea72def6985fff525cafb8238cfe7a (patch) | |
| tree | 729fe830476064bb58fd5d798c1a1c3efebaf271 | |
| parent | 1864362aaf97ac2fd5118a842c1df694054c0cdb (diff) | |
| download | efl-15f8d943aaea72def6985fff525cafb8238cfe7a.tar.gz | |
edje calc no longer performs calculations for group parts of fixed size > 0
when I said > 0 in the last commit message, I was thinking ahead to this commit
which I knew I would later have to make, but had not yet written because I had not
spent the requisite number of hours debugging the code to know that I needed to
have the check in both the code and the commit message
ref 3a451650d2f875077419e5777c49d04c618211f0
| -rw-r--r-- | src/lib/edje/edje_calc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index 243d93f048..1b74301a6d 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -3232,7 +3232,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta min = &ep->chosen_description->min; max = &ep->chosen_description->max; } - if (min && max && (min->w == max->w) && (min->h == max->h)) + if (min && max && (min->w == max->w) && (min->h == max->h) && (min->w > 0) && (min->h > 0)) mmw = min->w, mmh = min->h; else edje_object_size_min_calc(ep->typedata.swallow->swallowed_object, |