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

edje: parent link should be properly set before instantiating sub object. 

SVN revision: 59989
This commit is contained in:
Cedric BAIL 2011-06-06 13:10:54 +00:00
parent 564f6f272f
commit 9c22d6a9e9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/edje/src/lib/edje_load.c
View File

@ -699,6 +699,11 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
child_obj = edje_object_add(ed->base.evas);
group_path = eina_list_append(group_path, group_path_entry);
if (rp->part->type == EDJE_PART_TYPE_GROUP)
{
_edje_real_part_swallow(rp, child_obj);
}
if (!_edje_object_file_set_internal(child_obj, file, source, group_path))
{
_edje_thaw(ed);
@ -728,7 +733,6 @@ _edje_object_file_set_internal(Evas_Object *obj, const char *file, const char *g
edje_object_signal_callback_add(child_obj, "*", "*", _cb_signal_repeat, obj);
if (rp->part->type == EDJE_PART_TYPE_GROUP)
{
_edje_real_part_swallow(rp, child_obj);
source = NULL;
}
else