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

edje: remove object from the tracked list when they are deleted. 

SVN revision: 71672
This commit is contained in:
Cedric BAIL 2012-06-04 01:24:07 +00:00
parent 8fb40ff92f
commit d7e9d661f0
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3994,10 +3994,34 @@ _edje_real_part_box_remove_all(Edje_Real_Part *rp, Eina_Bool clear)
}
static void
_edje_table_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child __UNUSED__, void *einfo __UNUSED__)
_edje_table_child_del_cb(void *data, Evas *e __UNUSED__, Evas_Object *child, void *einfo __UNUSED__)
{
Edje_User_Defined *eud;
Eina_List *l;
Edje_Real_Part *rp = data;
EINA_LIST_FOREACH(rp->edje->user_defined, l, eud)
if (rp->part->type == EDJE_PART_TYPE_BOX)
{
if (eud->type == EDJE_USER_BOX_PACK &&
eud->u.box.child == child &&
!strcmp(rp->part->name, eud->part))
{
_edje_user_definition_free(eud);
break;
}
}
else if (rp->part->type == EDJE_PART_TYPE_TABLE)
{
if (eud->type == EDJE_USER_TABLE_PACK &&
eud->u.table.child == child &&
!strcmp(rp->part->name, eud->part))
{
_edje_user_definition_free(eud);
break;
}
}
rp->edje->dirty = 1;
rp->edje->recalc_call = 1;
#ifdef EDJE_CALC_CACHE
@ -4066,7 +4090,6 @@ edje_object_part_table_pack(Evas_Object *obj, const char *part, Evas_Object *chi
if (rp->part->type != EDJE_PART_TYPE_TABLE) return EINA_FALSE;
r = _edje_real_part_table_pack(rp, child_obj, col, row, colspan, rowspan);
if (r)
{
eud = _edje_user_definition_new(EDJE_USER_TABLE_PACK, part, ed);