summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_vg_container.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-20 15:24:09 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-21 14:04:59 -0500
commit7eb0375c0e0ad42f9e6be264c27cc5a04af054b7 (patch)
tree8f745c215bdb161e7f75d52ea74c6e4916491f96 /src/lib/evas/canvas/evas_vg_container.c
parent4959286c2922376381e6d978ee28b616cc396d9d (diff)
efl_vg: namespace moves
efl.vg -> efl.canvas.vg.node efl.vg.* -> efl.canvas.vg.* ref T6714
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_container.c')
-rw-r--r--src/lib/evas/canvas/evas_vg_container.c56
1 files changed, 28 insertions, 28 deletions
diff --git a/src/lib/evas/canvas/evas_vg_container.c b/src/lib/evas/canvas/evas_vg_container.c
index d501289..5869c40 100644
--- a/src/lib/evas/canvas/evas_vg_container.c
+++ b/src/lib/evas/canvas/evas_vg_container.c
@@ -3,19 +3,19 @@
3 3
4#include "evas_vg_private.h" 4#include "evas_vg_private.h"
5 5
6#define MY_CLASS EFL_VG_CONTAINER_CLASS 6#define MY_CLASS EFL_CANVAS_VG_CONTAINER_CLASS
7 7
8static void 8static void
9_efl_vg_container_render_pre(Eo *obj EINA_UNUSED, 9_efl_canvas_vg_container_render_pre(Eo *obj EINA_UNUSED,
10 Eina_Matrix3 *parent, 10 Eina_Matrix3 *parent,
11 Ector_Surface *s, 11 Ector_Surface *s,
12 void *data, 12 void *data,
13 Efl_VG_Data *nd) 13 Efl_Canvas_VG_Node_Data *nd)
14{ 14{
15 Efl_VG_Container_Data *pd = data; 15 Efl_Canvas_VG_Container_Data *pd = data;
16 Eina_List *l; 16 Eina_List *l;
17 Eo *child; 17 Eo *child;
18 Efl_VG_Data *child_nd; 18 Efl_Canvas_VG_Node_Data *child_nd;
19 Efl_Gfx_Change_Flag flag; 19 Efl_Gfx_Change_Flag flag;
20 20
21 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ; 21 if (nd->flags == EFL_GFX_CHANGE_FLAG_NONE) return ;
@@ -23,13 +23,13 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED,
23 flag = nd->flags; 23 flag = nd->flags;
24 nd->flags = EFL_GFX_CHANGE_FLAG_NONE; 24 nd->flags = EFL_GFX_CHANGE_FLAG_NONE;
25 25
26 EFL_VG_COMPUTE_MATRIX(current, parent, nd); 26 EFL_CANVAS_VG_COMPUTE_MATRIX(current, parent, nd);
27 27
28 EINA_LIST_FOREACH(pd->children, l, child) 28 EINA_LIST_FOREACH(pd->children, l, child)
29 { 29 {
30 if (flag & EFL_GFX_CHANGE_FLAG_MATRIX) 30 if (flag & EFL_GFX_CHANGE_FLAG_MATRIX)
31 { 31 {
32 child_nd = efl_data_scope_get(child, EFL_VG_CLASS); 32 child_nd = efl_data_scope_get(child, EFL_CANVAS_VG_NODE_CLASS);
33 child_nd->flags |= EFL_GFX_CHANGE_FLAG_MATRIX; 33 child_nd->flags |= EFL_GFX_CHANGE_FLAG_MATRIX;
34 } 34 }
35 _evas_vg_render_pre(child, s, current); 35 _evas_vg_render_pre(child, s, current);
@@ -37,17 +37,17 @@ _efl_vg_container_render_pre(Eo *obj EINA_UNUSED,
37} 37}
38 38
39static Eo * 39static Eo *
40_efl_vg_container_efl_object_constructor(Eo *obj, 40_efl_canvas_vg_container_efl_object_constructor(Eo *obj,
41 Efl_VG_Container_Data *pd) 41 Efl_Canvas_VG_Container_Data *pd)
42{ 42{
43 Efl_VG_Data *nd; 43 Efl_Canvas_VG_Node_Data *nd;
44 44
45 pd->names = eina_hash_stringshared_new(NULL); 45 pd->names = eina_hash_stringshared_new(NULL);
46 46
47 obj = efl_constructor(efl_super(obj, MY_CLASS)); 47 obj = efl_constructor(efl_super(obj, MY_CLASS));
48 48
49 nd = efl_data_scope_get(obj, EFL_VG_CLASS); 49 nd = efl_data_scope_get(obj, EFL_CANVAS_VG_NODE_CLASS);
50 nd->render_pre = _efl_vg_container_render_pre; 50 nd->render_pre = _efl_canvas_vg_container_render_pre;
51 nd->data = pd; 51 nd->data = pd;
52 nd->flags = EFL_GFX_CHANGE_FLAG_ALL; 52 nd->flags = EFL_GFX_CHANGE_FLAG_ALL;
53 53
@@ -55,8 +55,8 @@ _efl_vg_container_efl_object_constructor(Eo *obj,
55} 55}
56 56
57static void 57static void
58_efl_vg_container_efl_object_destructor(Eo *obj, 58_efl_canvas_vg_container_efl_object_destructor(Eo *obj,
59 Efl_VG_Container_Data *pd EINA_UNUSED) 59 Efl_Canvas_VG_Container_Data *pd EINA_UNUSED)
60{ 60{
61 efl_destructor(efl_super(obj, MY_CLASS)); 61 efl_destructor(efl_super(obj, MY_CLASS));
62 62
@@ -65,8 +65,8 @@ _efl_vg_container_efl_object_destructor(Eo *obj,
65} 65}
66 66
67static void 67static void
68_efl_vg_container_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED, 68_efl_canvas_vg_container_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED,
69 Efl_VG_Container_Data *pd, 69 Efl_Canvas_VG_Container_Data *pd,
70 Eina_Rect *r) 70 Eina_Rect *r)
71{ 71{
72 Eina_Rect s; 72 Eina_Rect s;
@@ -92,7 +92,7 @@ _efl_vg_container_efl_gfx_path_bounds_get(Eo *obj EINA_UNUSED,
92} 92}
93 93
94static Efl_VG * 94static Efl_VG *
95_efl_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_VG_Container_Data *pd, const char *name) 95_efl_canvas_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_Data *pd, const char *name)
96{ 96{
97 const char *tmp = eina_stringshare_add(name); 97 const char *tmp = eina_stringshare_add(name);
98 Efl_VG *r; 98 Efl_VG *r;
@@ -104,14 +104,14 @@ _efl_vg_container_child_get(Eo *obj EINA_UNUSED, Efl_VG_Container_Data *pd, cons
104} 104}
105 105
106static Eina_Iterator * 106static Eina_Iterator *
107_efl_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_VG_Container_Data *pd) 107_efl_canvas_vg_container_children_get(Eo *obj EINA_UNUSED, Efl_Canvas_VG_Container_Data *pd)
108{ 108{
109 return eina_list_iterator_new(pd->children); 109 return eina_list_iterator_new(pd->children);
110} 110}
111 111
112static Eina_Bool 112static Eina_Bool
113_efl_vg_container_efl_gfx_path_interpolate(Eo *obj, 113_efl_canvas_vg_container_efl_gfx_path_interpolate(Eo *obj,
114 Efl_VG_Container_Data *pd, 114 Efl_Canvas_VG_Container_Data *pd,
115 const Efl_VG *from, const Efl_VG *to, 115 const Efl_VG *from, const Efl_VG *to,
116 double pos_map) 116 double pos_map)
117{ 117{
@@ -121,16 +121,16 @@ _efl_vg_container_efl_gfx_path_interpolate(Eo *obj,
121 Eo *from_child, *to_child, *child; 121 Eo *from_child, *to_child, *child;
122 122
123 //1. check if both the object are containers 123 //1. check if both the object are containers
124 if (!(efl_isa(from, EFL_VG_CONTAINER_CLASS) && 124 if (!(efl_isa(from, EFL_CANVAS_VG_CONTAINER_CLASS) &&
125 efl_isa(to, EFL_VG_CONTAINER_CLASS))) 125 efl_isa(to, EFL_CANVAS_VG_CONTAINER_CLASS)))
126 return EINA_FALSE; 126 return EINA_FALSE;
127 127
128 r = efl_gfx_path_interpolate(efl_super(obj, EFL_VG_CONTAINER_CLASS), from, to, pos_map); 128 r = efl_gfx_path_interpolate(efl_super(obj, EFL_CANVAS_VG_CONTAINER_CLASS), from, to, pos_map);
129 129
130 if (!r) return EINA_FALSE; 130 if (!r) return EINA_FALSE;
131 131
132 from_it = efl_vg_container_children_get((Efl_VG *)from); 132 from_it = efl_canvas_vg_container_children_get((Efl_VG *)from);
133 to_it = efl_vg_container_children_get((Efl_VG *)to); 133 to_it = efl_canvas_vg_container_children_get((Efl_VG *)to);
134 EINA_LIST_FOREACH (pd->children, l, child) 134 EINA_LIST_FOREACH (pd->children, l, child)
135 { 135 {
136 res &= eina_iterator_next(from_it, (void **)&from_child); 136 res &= eina_iterator_next(from_it, (void **)&from_child);
@@ -152,7 +152,7 @@ _efl_vg_container_efl_gfx_path_interpolate(Eo *obj,
152} 152}
153 153
154EOLIAN static Efl_VG * 154EOLIAN static Efl_VG *
155_efl_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Container_Data *pd) 155_efl_canvas_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_Canvas_VG_Container_Data *pd)
156{ 156{
157 Eina_List *l; 157 Eina_List *l;
158 Efl_VG *child; 158 Efl_VG *child;
@@ -170,7 +170,7 @@ _efl_vg_container_efl_duplicate_duplicate(const Eo *obj, Efl_VG_Container_Data *
170EAPI Efl_VG* 170EAPI Efl_VG*
171evas_vg_container_add(Efl_VG *parent) 171evas_vg_container_add(Efl_VG *parent)
172{ 172{
173 return efl_add(EFL_VG_CONTAINER_CLASS, parent); 173 return efl_add(EFL_CANVAS_VG_CONTAINER_CLASS, parent);
174} 174}
175 175
176#include "efl_vg_container.eo.c" 176#include "efl_canvas_vg_container.eo.c"