forked from enlightenment/efl
edje: unswallow object that are about to be swallowed.
SVN revision: 66934
This commit is contained in:
parent
4a1c04491e
commit
e7ce3c5c0f
|
@ -266,3 +266,7 @@
|
||||||
2012-01-05 Cedric Bail
|
2012-01-05 Cedric Bail
|
||||||
|
|
||||||
* Reduce call to stat during edje_object_file_set.
|
* Reduce call to stat during edje_object_file_set.
|
||||||
|
|
||||||
|
2012-01-06 Cedric Bail
|
||||||
|
|
||||||
|
* Unswallow object that are about to be swallowed if necessary.
|
||||||
|
|
|
@ -11,6 +11,7 @@ Improvements:
|
||||||
* speedup load time of Edje file.
|
* speedup load time of Edje file.
|
||||||
* check existence of group at compile time also.
|
* check existence of group at compile time also.
|
||||||
* reduce number of call to stat during edje_object_file_set.
|
* 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:
|
Changes since Edje 1.0.0:
|
||||||
-------------------------
|
-------------------------
|
||||||
|
|
|
@ -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
|
// XXX: by Sachiel, January 21th 2009, 19:30 UTC
|
||||||
_edje_recalc_do(ed);
|
_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);
|
rp = _edje_real_part_recursive_get(ed, (char *)part);
|
||||||
if (!rp) return EINA_FALSE;
|
if (!rp) return EINA_FALSE;
|
||||||
if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
|
if (rp->part->type != EDJE_PART_TYPE_SWALLOW)
|
||||||
|
|
Loading…
Reference in New Issue