diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-28 00:06:15 +0000 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-28 00:06:15 +0000 |
commit | 2ca6c301e4ad75f9a58432db75215d1d29c73bd4 (patch) | |
tree | e69d3dca13313f6856fd0b1c1eadc2ba7c99ff0e | |
parent | 0ecbb416ad570d068b6a0b7115c52a32b0dc8b8b (diff) | |
download | efl-2ca6c301e4ad75f9a58432db75215d1d29c73bd4.tar.gz |
edje - fix min size calc after being broken by previous commit
37b55172b0d46d71f772af8fba17e1fb1b7c6c2c breaks min size calc. elm
toolbar was being squashed. e toolbars also were becoming 0 sized.
Just because a swallow does not have content does not mean it does not
affect the minimum size. there still could be a min size set on it
anyway etc. ...
-rw-r--r-- | src/lib/edje/edje_calc.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index cadadb5f72..aec16f9fd0 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -989,12 +989,6 @@ _edje_recalc_table_parts(Edje *ed { ep = ed->table_parts[i]; - //Ignore if the real part doesn't have swallowed object - if ((ep->part->type == EDJE_PART_TYPE_SWALLOW) && - (ep->typedata.swallow) && - (!ep->typedata.swallow->swallowed_object)) - continue; - if (ep->calculated != FLAG_XY) // FIXME: this is always true (see for above) _edje_part_recalc(ed, ep, (~ep->calculated) & FLAG_XY, NULL); } |