diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-03 16:30:59 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-03 16:30:59 +0200 |
commit | eb2bd9a8d8ff79bb30a1888969bb5960e8fed066 (patch) | |
tree | 441470b05dc400cb8f76c806909ef67f6c2de13a /src/lib/evas/canvas/evas_vg_private.h | |
parent | dd1cae7329c933d48c488a99d297706d29d4521a (diff) |
evas: move Evas.VG_* to Efl.VG.*
This also introduce legacy API for all of them.
Diffstat (limited to 'src/lib/evas/canvas/evas_vg_private.h')
-rw-r--r-- | src/lib/evas/canvas/evas_vg_private.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/evas/canvas/evas_vg_private.h b/src/lib/evas/canvas/evas_vg_private.h index 1c7d516615..8db3396c02 100644 --- a/src/lib/evas/canvas/evas_vg_private.h +++ b/src/lib/evas/canvas/evas_vg_private.h | |||
@@ -3,17 +3,17 @@ | |||
3 | 3 | ||
4 | #include <Ector.h> | 4 | #include <Ector.h> |
5 | 5 | ||
6 | typedef struct _Evas_VG_Node_Data Evas_VG_Node_Data; | 6 | typedef struct _Efl_VG_Base_Data Efl_VG_Base_Data; |
7 | typedef struct _Evas_VG_Container_Data Evas_VG_Container_Data; | 7 | typedef struct _Efl_VG_Container_Data Efl_VG_Container_Data; |
8 | typedef struct _Evas_VG_Gradient_Data Evas_VG_Gradient_Data; | 8 | typedef struct _Efl_VG_Gradient_Data Efl_VG_Gradient_Data; |
9 | 9 | ||
10 | struct _Evas_VG_Node_Data | 10 | struct _Efl_VG_Base_Data |
11 | { | 11 | { |
12 | Eina_Matrix3 *m; | 12 | Eina_Matrix3 *m; |
13 | Evas_VG_Node *mask; | 13 | Efl_VG *mask; |
14 | Ector_Renderer *renderer; | 14 | Ector_Renderer *renderer; |
15 | 15 | ||
16 | void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Evas_VG_Node_Data *nd); | 16 | void (*render_pre)(Eo *obj, Eina_Matrix3 *parent, Ector_Surface *s, void *data, Efl_VG_Base_Data *nd); |
17 | void *data; | 17 | void *data; |
18 | 18 | ||
19 | double x, y; | 19 | double x, y; |
@@ -23,12 +23,12 @@ struct _Evas_VG_Node_Data | |||
23 | Eina_Bool changed : 1; | 23 | Eina_Bool changed : 1; |
24 | }; | 24 | }; |
25 | 25 | ||
26 | struct _Evas_VG_Container_Data | 26 | struct _Efl_VG_Container_Data |
27 | { | 27 | { |
28 | Eina_List *children; | 28 | Eina_List *children; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | struct _Evas_VG_Gradient_Data | 31 | struct _Efl_VG_Gradient_Data |
32 | { | 32 | { |
33 | // FIXME: Later on we should deduplicate it somehow (Using Ector ?). | 33 | // FIXME: Later on we should deduplicate it somehow (Using Ector ?). |
34 | Efl_Gfx_Gradient_Stop *colors; | 34 | Efl_Gfx_Gradient_Stop *colors; |
@@ -37,14 +37,14 @@ struct _Evas_VG_Gradient_Data | |||
37 | Efl_Gfx_Gradient_Spread s; | 37 | Efl_Gfx_Gradient_Spread s; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | static inline Evas_VG_Node_Data * | 40 | static inline Efl_VG_Base_Data * |
41 | _evas_vg_render_pre(Evas_VG_Node *child, Ector_Surface *s, Eina_Matrix3 *m) | 41 | _evas_vg_render_pre(Efl_VG *child, Ector_Surface *s, Eina_Matrix3 *m) |
42 | { | 42 | { |
43 | Evas_VG_Node_Data *child_nd = NULL; | 43 | Efl_VG_Base_Data *child_nd = NULL; |
44 | 44 | ||
45 | // FIXME: Prevent infinite loop | 45 | // FIXME: Prevent infinite loop |
46 | if (child) | 46 | if (child) |
47 | child_nd = eo_data_scope_get(child, EVAS_VG_NODE_CLASS); | 47 | child_nd = eo_data_scope_get(child, EFL_VG_BASE_CLASS); |
48 | if (child_nd) | 48 | if (child_nd) |
49 | child_nd->render_pre(child, m, s, child_nd->data, child_nd); | 49 | child_nd->render_pre(child, m, s, child_nd->data, child_nd); |
50 | 50 | ||
@@ -52,12 +52,12 @@ _evas_vg_render_pre(Evas_VG_Node *child, Ector_Surface *s, Eina_Matrix3 *m) | |||
52 | } | 52 | } |
53 | 53 | ||
54 | static inline void | 54 | static inline void |
55 | _evas_vg_node_changed(Eo *obj) | 55 | _efl_vg_base_changed(Eo *obj) |
56 | { | 56 | { |
57 | eo_do(obj, eo_event_callback_call(EFL_GFX_CHANGED, NULL)); | 57 | eo_do(obj, eo_event_callback_call(EFL_GFX_CHANGED, NULL)); |
58 | } | 58 | } |
59 | 59 | ||
60 | #define EVAS_VG_COMPUTE_MATRIX(Current, Parent, Nd) \ | 60 | #define EFL_VG_COMPUTE_MATRIX(Current, Parent, Nd) \ |
61 | Eina_Matrix3 *Current = Nd->m; \ | 61 | Eina_Matrix3 *Current = Nd->m; \ |
62 | Eina_Matrix3 _matrix_tmp; \ | 62 | Eina_Matrix3 _matrix_tmp; \ |
63 | \ | 63 | \ |