elementary/elm_widget : sd2->parent should be set as NULL after all

focus control is finished.


SVN revision: 65400
This commit is contained in:
WooHyun Jung 2011-11-19 03:50:58 +00:00
parent d6be239f73
commit a8bd6a6ff4
1 changed files with 11 additions and 11 deletions

View File

@ -983,17 +983,6 @@ elm_widget_sub_object_del(Evas_Object *obj,
}
if (_elm_widget_is(sobj))
{
Smart_Data *sd2 = evas_object_smart_data_get(sobj);
if (sd2)
{
sd2->parent_obj = NULL;
if (sd2->resize_obj == sobj)
sd2->resize_obj = NULL;
else
sd->subobjs = eina_list_remove(sd->subobjs, sobj);
}
else
sd->subobjs = eina_list_remove(sd->subobjs, sobj);
if (elm_widget_focus_get(sobj))
{
elm_widget_tree_unfocusable_set(sobj, EINA_TRUE);
@ -1013,6 +1002,17 @@ elm_widget_sub_object_del(Evas_Object *obj,
}
}
}
Smart_Data *sd2 = evas_object_smart_data_get(sobj);
if (sd2)
{
sd2->parent_obj = NULL;
if (sd2->resize_obj == sobj)
sd2->resize_obj = NULL;
else
sd->subobjs = eina_list_remove(sd->subobjs, sobj);
}
else
sd->subobjs = eina_list_remove(sd->subobjs, sobj);
}
else
sd->subobjs = eina_list_remove(sd->subobjs, sobj);