summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_vg_private.h
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_private.h
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_private.h')
-rw-r--r--src/lib/evas/canvas/evas_vg_private.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h
index de3ca45009..588db73cb5 100644
--- a/src/lib/evas/canvas/evas_vg_private.h
+++ b/src/lib/evas/canvas/evas_vg_private.h
@@ -3,10 +3,10 @@
3 3
4#include <Ector.h> 4#include <Ector.h>
5 5
6typedef struct _Efl_VG_Data Efl_VG_Data; 6typedef struct _Efl_Canvas_VG_Node_Data Efl_Canvas_VG_Node_Data;
7typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data; 7typedef struct _Efl_Canvas_VG_Container_Data Efl_Canvas_VG_Container_Data;
8typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data; 8typedef struct _Efl_Canvas_VG_Gradient_Data Efl_Canvas_VG_Gradient_Data;
9typedef struct _Efl_VG_Interpolation Efl_VG_Interpolation; 9typedef struct _Efl_Canvas_VG_Interpolation Efl_Canvas_VG_Interpolation;
10 10
11 11
12typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data; 12typedef struct _Efl_Canvas_Vg_Data Efl_Canvas_Vg_Data;
@@ -54,15 +54,15 @@ struct _Efl_Canvas_Vg_Data
54 Eina_Bool changed; 54 Eina_Bool changed;
55}; 55};
56 56
57struct _Efl_VG_Data 57struct _Efl_Canvas_VG_Node_Data
58{ 58{
59 Eina_Matrix3 *m; 59 Eina_Matrix3 *m;
60 Efl_VG_Interpolation *intp; 60 Efl_Canvas_VG_Interpolation *intp;
61 61
62 Efl_VG *mask; 62 Efl_Canvas_VG_Node *mask;
63 Ector_Renderer *renderer; 63 Ector_Renderer *renderer;
64 64
65 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_VG_Data *nd); 65 void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_Canvas_VG_Node_Data *nd);
66 void *data; 66 void *data;
67 67
68 double x, y; 68 double x, y;
@@ -73,14 +73,14 @@ struct _Efl_VG_Data
73 Eina_Bool changed : 1; 73 Eina_Bool changed : 1;
74}; 74};
75 75
76struct _Efl_VG_Container_Data 76struct _Efl_Canvas_VG_Container_Data
77{ 77{
78 Eina_List *children; 78 Eina_List *children;
79 79
80 Eina_Hash *names; 80 Eina_Hash *names;
81}; 81};
82 82
83struct _Efl_VG_Gradient_Data 83struct _Efl_Canvas_VG_Gradient_Data
84{ 84{
85 // FIXME: Later on we should deduplicate it somehow (Using Ector ?). 85 // FIXME: Later on we should deduplicate it somehow (Using Ector ?).
86 Efl_Gfx_Gradient_Stop *colors; 86 Efl_Gfx_Gradient_Stop *colors;
@@ -89,7 +89,7 @@ struct _Efl_VG_Gradient_Data
89 Efl_Gfx_Gradient_Spread s; 89 Efl_Gfx_Gradient_Spread s;
90}; 90};
91 91
92struct _Efl_VG_Interpolation 92struct _Efl_Canvas_VG_Interpolation
93{ 93{
94 Eina_Quaternion rotation; 94 Eina_Quaternion rotation;
95 Eina_Quaternion perspective; 95 Eina_Quaternion perspective;
@@ -108,14 +108,14 @@ Vg_File_Data * evas_cache_vg_file_info(const char *file, const char
108 108
109Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags); 109Eina_Bool evas_vg_save_to_file(Vg_File_Data *evg_data, const char *file, const char *key, const char *flags);
110 110
111static inline Efl_VG_Data * 111static inline Efl_Canvas_VG_Node_Data *
112_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) 112_evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
113{ 113{
114 Efl_VG_Data *child_nd = NULL; 114 Efl_Canvas_VG_Node_Data *child_nd = NULL;
115 115
116 // FIXME: Prevent infinite loop 116 // FIXME: Prevent infinite loop
117 if (child) 117 if (child)
118 child_nd = efl_data_scope_get(child, EFL_VG_CLASS); 118 child_nd = efl_data_scope_get(child, EFL_CANVAS_VG_NODE_CLASS);
119 if (child_nd) 119 if (child_nd)
120 child_nd->render_pre(child, m, s, child_nd->data, child_nd); 120 child_nd->render_pre(child, m, s, child_nd->data, child_nd);
121 121
@@ -123,7 +123,7 @@ _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m)
123} 123}
124 124
125static inline void 125static inline void
126_efl_vg_changed(Eo *obj) 126_efl_canvas_vg_node_changed(Eo *obj)
127{ 127{
128 Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_FILL }; 128 Efl_Gfx_Path_Change_Event ev = { EFL_GFX_CHANGE_FLAG_FILL };
129 efl_event_callback_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev); 129 efl_event_callback_call(obj, EFL_GFX_PATH_EVENT_CHANGED, &ev);
@@ -147,7 +147,7 @@ _efl_vg_clean_object(Eo **obj)
147 *obj = NULL; 147 *obj = NULL;
148} 148}
149 149
150#define EFL_VG_COMPUTE_MATRIX(Current, Parent, Nd) \ 150#define EFL_CANVAS_VG_COMPUTE_MATRIX(Current, Parent, Nd) \
151 Eina_Matrix3 *Current = Nd->m; \ 151 Eina_Matrix3 *Current = Nd->m; \
152 Eina_Matrix3 _matrix_tmp; \ 152 Eina_Matrix3 _matrix_tmp; \
153 \ 153 \