bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b27ecc58ddd05465b441682e2a20fd06f66a6c48

commit b27ecc58ddd05465b441682e2a20fd06f66a6c48
Author: Mike Blumenkrantz <zm...@samsung.com>
Date:   Tue Jul 10 07:31:32 2018 -0400

    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
---
 src/lib/edje/edje_smart.c | 8 +++-----
 1 file 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

-- 


Reply via email to