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

evas: parent of an Efl.Vg.Node can also be a Efl.Canvas.VG

This commit is contained in:
Cedric BAIL 2018-03-29 13:57:31 -07:00
parent d7da460dd2
commit c515ee36e6
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/evas/canvas/evas_vg_node.c
View File

@ -205,8 +205,8 @@ _efl_canvas_vg_node_efl_gfx_geometry_get(Eo *obj, Efl_Canvas_VG_Node_Data *pd EI
// Parent should be a container otherwise dismissing the stacking operation
static Eina_Bool
_efl_canvas_vg_node_parent_checked_get(Eo *obj,
Eo **parent,
Efl_Canvas_VG_Container_Data **cd)
Eo **parent,
Efl_Canvas_VG_Container_Data **cd)
{
*cd = NULL;
*parent = efl_parent_get(obj);
@ -222,7 +222,8 @@ _efl_canvas_vg_node_parent_checked_get(Eo *obj,
}
else if (efl_isa(*parent, EFL_CANVAS_VG_CLASS))
{
goto on_error;
*cd = NULL;
*parent = NULL;
}
else if (*parent != NULL)
{
@ -327,7 +328,8 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
{
Efl_Canvas_VG_Container_Data *cd = NULL;
Efl_Canvas_VG_Container_Data *old_cd = NULL;
Eo *old_parent;
Eo *old_parent = NULL;
Eina_Bool parent_container = EINA_TRUE;
if (efl_isa(parent, EFL_CANVAS_VG_CONTAINER_CLASS))
{
@ -338,9 +340,13 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
goto on_error;
}
}
else if (efl_isa(parent, EFL_CANVAS_VG_CLASS))
{
parent_container = EINA_FALSE;
}
else if (parent != NULL)
{
ERR("%p not even an EVAS_VG_CLASS.", parent);
ERR("%p not even an Vector Graphics related class.", parent);
goto on_error;
}
@ -368,7 +374,7 @@ _efl_canvas_vg_node_efl_object_parent_set(Eo *obj,
_efl_canvas_vg_node_changed(old_parent);
_efl_canvas_vg_node_changed(obj);
_efl_canvas_vg_node_changed(parent);
if (parent_container) _efl_canvas_vg_node_changed(parent);
return ;

3
src/lib/evas/canvas/evas_vg_private.h
View File

@ -126,7 +126,8 @@ static inline void
_efl_canvas_vg_node_changed(Eo *obj)
{
Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_FILL };
efl_event_callback_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev);
if (obj) efl_event_callback_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev);
}
static inline void *