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

elm_widget: support logical parents that are not elm_widgets

This commit is contained in:
Marcel Hollerbach 2017-10-15 15:30:08 +02:00
parent e25d494590
commit 0a814a0c71
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/elementary/elm_widget.c
View File

@ -466,6 +466,8 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
//update old logical parent; //update old logical parent;
if (pd->logical.parent) if (pd->logical.parent)
{
if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS))
{ {
ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd); ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd);
if (!logical_wd) if (!logical_wd)
@ -474,19 +476,23 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd)
return NULL; return NULL;
} }
logical_wd->logical.child_count --; logical_wd->logical.child_count --;
}
old = pd->logical.parent; old = pd->logical.parent;
efl_weak_unref(&pd->logical.parent); efl_weak_unref(&pd->logical.parent);
pd->logical.parent = NULL; pd->logical.parent = NULL;
} }
if (parent) if (parent)
{ {
ELM_WIDGET_DATA_GET(parent, logical_wd); if (efl_isa(parent, ELM_WIDGET_CLASS))
if (!logical_wd) {
ELM_WIDGET_DATA_GET(parent, parent_wd);
if (!parent_wd)
{ {
ERR("Widget parent has the wrong type!"); ERR("Widget parent has the wrong type!");
return NULL; return NULL;
} }
logical_wd->logical.child_count ++; parent_wd->logical.child_count ++;
}
pd->logical.parent = parent; pd->logical.parent = parent;
efl_weak_ref(&pd->logical.parent); efl_weak_ref(&pd->logical.parent);
} }
@ -503,15 +509,14 @@ _full_eval(Eo *obj, Elm_Widget_Smart_Data *pd)
old_parent = _logical_parent_eval(obj, pd); old_parent = _logical_parent_eval(obj, pd);
if (old_parent) if (efl_isa(old_parent, ELM_WIDGET_CLASS))
{ {
//emit signal and focus eval old and new //emit signal and focus eval old and new
ELM_WIDGET_DATA_GET(old_parent, old_pd); ELM_WIDGET_DATA_GET(old_parent, old_pd);
_full_eval(old_parent, old_pd); _full_eval(old_parent, old_pd);
} }
if (pd->logical.parent) if (efl_isa(pd->logical.parent, ELM_WIDGET_CLASS))
{ {
ELM_WIDGET_DATA_GET(pd->logical.parent, new_pd); ELM_WIDGET_DATA_GET(pd->logical.parent, new_pd);
_full_eval(pd->logical.parent, new_pd); _full_eval(pd->logical.parent, new_pd);