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

elementary/elm_layout : Sync with old elm_layout. elm_widget_sub_object_add 

should be called prior to edje_object_part_swallow. This is because
evas-callback function(about EVAS_CALLBACK_CHANGED_SIZE_HINTS) which is
registered by _smart_sub_object_add should be called after the one
registered by edje_object_part_swallow.


SVN revision: 70985
This commit is contained in:
WooHyun Jung 2012-05-14 06:13:47 +00:00
parent 9dc4f71db4
commit 68555430a3
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/elementary/src/lib/elm_layout.c
View File

@ -721,6 +721,12 @@ _elm_layout_smart_content_set(Evas_Object *obj,
if (content)
{
if (!elm_widget_sub_object_add(obj, content))
{
ERR("could not add %p as sub object of %p", content, obj);
return EINA_FALSE;
}
if (!edje_object_part_swallow
(ELM_WIDGET_DATA(sd)->resize_obj, part, content))
{
@ -728,14 +734,6 @@ _elm_layout_smart_content_set(Evas_Object *obj,
return EINA_FALSE;
}
if (!elm_widget_sub_object_add(obj, content))
{
ERR("could not add %p as sub object of %p", content, obj);
edje_object_part_unswallow
(ELM_WIDGET_DATA(sd)->resize_obj, content);
return EINA_FALSE;
}
sub_d = ELM_NEW(Elm_Layout_Sub_Object_Data);
sub_d->type = SWALLOW;
sub_d->part = eina_stringshare_add(part);