raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2ca6c301e4ad75f9a58432db75215d1d29c73bd4
commit 2ca6c301e4ad75f9a58432db75215d1d29c73bd4
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Nov 28 00:06:15 2019 +0000
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. ...
---
src/lib/edje/edje_calc.c | 6 ------
1 file changed, 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);
}
--
