summaryrefslogtreecommitdiff
path: root/unsorted/evas/evas-vg-simple.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-09-05 16:57:35 +0100
committerTom Hacohen <tom@stosb.com>2016-09-05 16:59:56 +0100
commitb00564d69876ba615f04652e9d5df13afc6e389a (patch)
tree535083868c9f2faac50fe8f6cd6ac0d5e56b993c /unsorted/evas/evas-vg-simple.c
parent394b9411ce3fbbbf3eb241315158fe2d4c07fe64 (diff)
Rename efl_self to efl_added
It has been discussed on the ML (thread: "[RFC] rename efl_self") and IRC, and has been decided we should rename it to this in order to avoid confusion with the already established meaning of self which is very similar to what we were using it for, but didn't have complete overlap. Kudos to Marcel Hollerbach for initiating the discussion and fighting for it until he convinced a significant mass. :) This commit breaks API, and depending on compiler potentially ABI. @feature
Diffstat (limited to 'unsorted/evas/evas-vg-simple.c')
-rw-r--r--unsorted/evas/evas-vg-simple.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/unsorted/evas/evas-vg-simple.c b/unsorted/evas/evas-vg-simple.c
index d7d641a..17bf3f0 100644
--- a/unsorted/evas/evas-vg-simple.c
+++ b/unsorted/evas/evas-vg-simple.c
@@ -104,15 +104,15 @@ vector_set(int x, int y, int w, int h)
104 root = efl_add(EFL_VG_CONTAINER_CLASS, NULL); 104 root = efl_add(EFL_VG_CONTAINER_CLASS, NULL);
105 //evas_vg_node_transformation_set(root, &matrix); 105 //evas_vg_node_transformation_set(root, &matrix);
106 106
107 Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "bg")); 107 Efl_VG *bg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "bg"));
108 evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0); 108 evas_vg_shape_shape_append_rect(bg, 0, 0 , vg_w, vg_h, 0, 0);
109 evas_vg_node_origin_set(bg, 0,0); 109 evas_vg_node_origin_set(bg, 0,0);
110 evas_vg_shape_stroke_width_set(bg, 1.0); 110 evas_vg_shape_stroke_width_set(bg, 1.0);
111 evas_vg_node_color_set(bg, 80, 80, 80, 80); 111 evas_vg_node_color_set(bg, 80, 80, 80, 80);
112 112
113 Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "shape")); 113 Efl_VG *shape = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "shape"));
114 Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_self, "rgradient")); 114 Efl_VG *rgradient = efl_add(EFL_VG_GRADIENT_RADIAL_CLASS, NULL, efl_vg_name_set(efl_added, "rgradient"));
115 Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_self, "lgradient")); 115 Efl_VG *lgradient = efl_add(EFL_VG_GRADIENT_LINEAR_CLASS, NULL, efl_vg_name_set(efl_added, "lgradient"));
116 116
117 evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330); 117 evas_vg_shape_shape_append_arc(shape, 0, 0, 100, 100, 25, 330);
118 118
@@ -153,7 +153,7 @@ vector_set(int x, int y, int w, int h)
153 evas_vg_node_color_set(shape, 0, 0, 255, 255); 153 evas_vg_node_color_set(shape, 0, 0, 255, 255);
154 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128); 154 evas_vg_shape_stroke_color_set(shape, 0, 0, 255, 128);
155 155
156 Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect")); 156 Efl_VG *rect = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect"));
157 evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0); 157 evas_vg_shape_shape_append_rect(rect, 0, 0, 100, 100, 0, 0);
158 evas_vg_node_origin_set(rect, 100, 100); 158 evas_vg_node_origin_set(rect, 100, 100);
159 evas_vg_shape_fill_set(rect, lgradient); 159 evas_vg_shape_fill_set(rect, lgradient);
@@ -161,7 +161,7 @@ vector_set(int x, int y, int w, int h)
161 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND); 161 evas_vg_shape_stroke_join_set(rect, EFL_GFX_JOIN_ROUND);
162 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255); 162 evas_vg_shape_stroke_color_set(rect, 255, 255, 255, 255);
163 163
164 Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "rect1")); 164 Efl_VG *rect1 = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "rect1"));
165 evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0); 165 evas_vg_shape_shape_append_rect(rect1, 0, 0, 70, 70, 0, 0);
166 evas_vg_node_origin_set(rect1, 50, 70); 166 evas_vg_node_origin_set(rect1, 50, 70);
167 evas_vg_shape_stroke_scale_set(rect1, 2); 167 evas_vg_shape_stroke_scale_set(rect1, 2);
@@ -169,7 +169,7 @@ vector_set(int x, int y, int w, int h)
169 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND); 169 evas_vg_shape_stroke_join_set(rect1, EFL_GFX_JOIN_ROUND);
170 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100); 170 evas_vg_shape_stroke_color_set(rect1, 0, 100, 80, 100);
171 171
172 Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "circle")); 172 Efl_VG *circle = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "circle"));
173 evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300); 173 evas_vg_shape_shape_append_arc(circle, 0, 0, 250, 100, 30, 300);
174 evas_vg_shape_fill_set(circle, lgradient); 174 evas_vg_shape_fill_set(circle, lgradient);
175 //evas_vg_node_transformation_set(&matrix), 175 //evas_vg_node_transformation_set(&matrix),
@@ -177,27 +177,27 @@ vector_set(int x, int y, int w, int h)
177 evas_vg_node_color_set(circle, 50, 0, 0, 50); 177 evas_vg_node_color_set(circle, 50, 0, 0, 50);
178 178
179 // Foreground 179 // Foreground
180 Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "fg")); 180 Efl_VG *fg = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "fg"));
181 evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0); 181 evas_vg_shape_shape_append_rect(fg, 0, 0, vg_w, vg_h, 0, 0);
182 evas_vg_node_origin_set(fg, 0, 0); 182 evas_vg_node_origin_set(fg, 0, 0);
183 evas_vg_shape_stroke_width_set(fg, 5.0); 183 evas_vg_shape_stroke_width_set(fg, 5.0);
184 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND); 184 evas_vg_shape_stroke_join_set(fg, EFL_GFX_JOIN_ROUND);
185 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70); 185 evas_vg_shape_stroke_color_set(fg, 70, 70, 0, 70);
186 186
187 Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "tst")); 187 Efl_VG *tst = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "tst"));
188 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5); 188 evas_vg_shape_shape_append_rect(tst, 50, 25, 200, 200, 3, 5);
189 evas_vg_node_color_set(tst, 0, 0, 200, 200); 189 evas_vg_node_color_set(tst, 0, 0, 200, 200);
190 evas_vg_shape_stroke_width_set(tst, 2); 190 evas_vg_shape_stroke_width_set(tst, 2);
191 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255); 191 evas_vg_shape_stroke_color_set(tst, 255, 0, 0, 255);
192 192
193 Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_self, "vc")); 193 Efl_VG *vc = efl_add(EFL_VG_SHAPE_CLASS, root, efl_vg_name_set(efl_added, "vc"));
194 evas_vg_shape_shape_append_circle(vc, 100, 100, 23); 194 evas_vg_shape_shape_append_circle(vc, 100, 100, 23);
195 evas_vg_node_color_set(vc, 0, 200, 0, 255); 195 evas_vg_node_color_set(vc, 0, 200, 0, 255);
196 evas_vg_shape_stroke_width_set(vc, 4); 196 evas_vg_shape_stroke_width_set(vc, 4);
197 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255); 197 evas_vg_shape_stroke_color_set(vc, 255, 0, 0, 255);
198 198
199 beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root)); 199 beginning = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_added, root));
200 end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_self, root)); 200 end = efl_add(EFL_VG_CONTAINER_CLASS, NULL, efl_vg_dup(efl_added, root));
201 201
202 circle = efl_vg_container_child_get(end, "circle"); 202 circle = efl_vg_container_child_get(end, "circle");
203 efl_vg_transformation_set(circle, &matrix); 203 efl_vg_transformation_set(circle, &matrix);