diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2018-07-10 07:31:32 -0400 |
|---|---|---|
| committer | SangHyeon Jade Lee <sh10233.lee@samsung.com> | 2018-07-12 11:34:48 +0900 |
| commit | 6d88ed0daa3404fdf1b664711ad1e7543006fbf9 (patch) | |
| tree | 996e7a4a90e68d0a68232bcc01805f3eda690971 | |
| parent | 4e535e776db55993d1795af48cff9eed6ea8b1e4 (diff) | |
| download | efl-6d88ed0daa3404fdf1b664711ad1e7543006fbf9.tar.gz | |
Revert "edje: clean up internal objects during invalidate"
This reverts commit 78cd61034185f07779d70163a38f5ffdffe5507b.
this patch needed a bit more review+testing; it fixes some issues but
creates others
Differential Revision: https://phab.enlightenment.org/D6551
| -rw-r--r-- | src/lib/edje/edje_smart.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/edje/edje_smart.c b/src/lib/edje/edje_smart.c index a3791a041c..29d042c40d 100644 --- a/src/lib/edje/edje_smart.c +++ b/src/lib/edje/edje_smart.c @@ -54,9 +54,9 @@ _efl_canvas_layout_efl_object_invalidate(Eo *obj, Edje *ed) { _edje_file_callbacks_del(ed, NULL); - /* after invalidate is called, all internal objects are destroyed as a result - * of being unparented. do cleanups here to avoid leaking - */ + efl_invalidate(efl_super(obj, MY_CLASS)); + + //invalidate is done, this means the legacy evas deletion event is called. for (int i = 0; i < ed->table_parts_size; ++i) { Edje_Real_Part *rp = ed->table_parts[i]; @@ -74,8 +74,6 @@ _efl_canvas_layout_efl_object_invalidate(Eo *obj, Edje *ed) break; } } - - efl_invalidate(efl_super(obj, MY_CLASS)); } EOLIAN static void |