dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Edje: Revert object_hide on unswallow, add documentation for the use case. 

SVN revision: 67034
This commit is contained in:
Youness Alaoui 2012-01-11 02:06:07 +00:00
parent 19de4626ab
commit b114f12349
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/src/lib/Edje.h
View File

@ -2967,7 +2967,9 @@ EAPI Eina_Bool edje_object_part_swallow (Evas_Object *obj, const c
* *
* Causes the edje to regurgitate a previously swallowed object. :) * Causes the edje to regurgitate a previously swallowed object. :)
* *
* @note @p obj_swallow will @b not be deleted. * @note @p obj_swallow will @b not be deleted or hidden.
* @note @p obj_swallow may appear shown on the evas depending on its state when
* it got unswallowed. Make sure you delete it or hide it if you do not want it to.
*/ */
EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow); EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow);

1
legacy/edje/src/lib/edje_util.c
View File

@ -2215,7 +2215,6 @@ edje_object_part_unswallow(Evas_Object *obj __UNUSED__, Evas_Object *obj_swallow
_edje_object_part_swallow_changed_hints_cb, _edje_object_part_swallow_changed_hints_cb,
rp); rp);
evas_object_clip_unset(rp->swallowed_object); evas_object_clip_unset(rp->swallowed_object);
evas_object_hide(rp->swallowed_object);
evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part"); evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
if (rp->part->mouse_events) if (rp->part->mouse_events)