furrymyad pushed a commit to branch efl-1.16. http://git.enlightenment.org/core/efl.git/commit/?id=968a6d5a68eb2e8d3f2af1aa9144f1b4d55262e0
commit 968a6d5a68eb2e8d3f2af1aa9144f1b4d55262e0 Author: Tom Hacohen <[email protected]> Date: Thu Apr 7 14:56:57 2016 +0100 Edje: Reparent when swallowing/unswallowing. On swallow make the edje object the parent, on unswallow the canvas. --- src/lib/edje/edje_edit.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c index b8fc2d4..8b82361 100644 --- a/src/lib/edje/edje_edit.c +++ b/src/lib/edje/edje_edit.c @@ -315,6 +315,7 @@ _edje_real_part_free(Edje *ed, Edje_Real_Part *rp) if ((rp->type == EDJE_RP_TYPE_SWALLOW) && (rp->typedata.swallow) && (rp->typedata.swallow->swallowed_object)) { + eo_parent_set(rp->typedata.swallow->swallowed_object, evas_common_evas_get(ed->obj)); evas_object_smart_member_del(rp->typedata.swallow->swallowed_object); evas_object_event_callback_del(rp->typedata.swallow->swallowed_object, EVAS_CALLBACK_FREE, _edje_object_part_swallow_free_cb); @@ -3147,7 +3148,11 @@ _edje_edit_real_part_add(Evas_Object *obj, const char *name, Edje_Part_Type type evas_object_show(rp->object); evas_object_smart_member_add(rp->object, ed->obj); evas_object_layer_set(rp->object, evas_object_layer_get(ed->obj)); - if (ep->type != EDJE_PART_TYPE_SWALLOW && ep->type != EDJE_PART_TYPE_GROUP) + if (ep->type == EDJE_PART_TYPE_SWALLOW) + { + eo_parent_set(rp->object, ed->obj); + } + else if (ep->type != EDJE_PART_TYPE_GROUP) { if (ep->mouse_events) { --
