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

edje: simplify the logic and make code easier to read.

This commit is contained in:
Cedric Bail 2013-07-05 10:18:49 +09:00
parent cb5dbb55c3
commit df7b19090a
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/edje/edje_load.c
View File

@ -1317,19 +1317,9 @@ _edje_file_del(Edje *ed)
if (rp->object)
{
switch (rp->part->type)
{
case EDJE_PART_TYPE_GROUP:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_EXTERNAL:
_edje_callbacks_focus_del(rp->object, ed);
break;
default:
if (rp->part->mouse_events)
_edje_callbacks_del(rp->object, ed);
break;
}
evas_object_del(rp->object);
_edje_callbacks_focus_del(rp->object, ed);
_edje_callbacks_del(rp->object, ed);
evas_object_del(rp->object);
}
if (rp->custom)

3
src/lib/edje/edje_util.c
View File

@ -6493,8 +6493,7 @@ _edje_real_part_swallow_clear(Edje *ed, Edje_Real_Part *rp)
rp);
evas_object_clip_unset(rp->typedata.swallow->swallowed_object);
evas_object_data_del(rp->typedata.swallow->swallowed_object, "\377 edje.swallowing_part");
if (rp->part->mouse_events)
_edje_callbacks_del(rp->typedata.swallow->swallowed_object, ed);
_edje_callbacks_del(rp->typedata.swallow->swallowed_object, ed);
_edje_callbacks_focus_del(rp->typedata.swallow->swallowed_object, ed);
rp->typedata.swallow->swallowed_object = NULL;
}