enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

edje: unswallow object that are about to be swallowed. 

SVN revision: 66934
This commit is contained in:
Cedric BAIL 2012-01-06 10:07:45 +00:00
parent 4a1c04491e
commit e7ce3c5c0f
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
legacy/edje/ChangeLog
View File

@ -266,3 +266,7 @@
2012-01-05 Cedric Bail
* Reduce call to stat during edje_object_file_set.
2012-01-06 Cedric Bail
* Unswallow object that are about to be swallowed if necessary.

1
legacy/edje/NEWS
View File

@ -11,6 +11,7 @@ Improvements:
* speedup load time of Edje file.
* check existence of group at compile time also.
* reduce number of call to stat during edje_object_file_set.
* unswallow object about to be swallowed if necessary.
Changes since Edje 1.0.0:
-------------------------

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

@ -1908,6 +1908,13 @@ edje_object_part_swallow(Evas_Object *obj, const char *part, Evas_Object *obj_sw
// XXX: by Sachiel, January 21th 2009, 19:30 UTC
_edje_recalc_do(ed);
rp = evas_object_data_get(obj_swallow, "\377 edje.swallowing_part");
if (rp)
{
/* The object is already swallowed somewhere, unswallow it first */
edje_object_part_unswallow(rp->edje->obj, obj_swallow);
}
rp = _edje_real_part_recursive_get(ed, (char *)part);
if (!rp) return EINA_FALSE;
if (rp->part->type != EDJE_PART_TYPE_SWALLOW)