summaryrefslogtreecommitdiff
path: root/src/examples
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:30:47 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-04-03 16:30:47 +0200
commit3b97e3d9cd13b16d269b18df6d0b24f7b4d5e667 (patch)
tree4189bebdf0e93be4c051fd815b4c442b2bc32212 /src/examples
parent09be34b82501fea8835299de72938cdf9c21c55a (diff)
evas: fix example to follow new Efl.Gfx interface.
Diffstat (limited to 'src/examples')
-rw-r--r--src/examples/evas/evas-3d-aabb.c14
-rw-r--r--src/examples/evas/evas-3d-blending.c4
-rw-r--r--src/examples/evas/evas-3d-cube.c14
-rw-r--r--src/examples/evas/evas-3d-cube2.c14
-rw-r--r--src/examples/evas/evas-3d-eet.c14
-rw-r--r--src/examples/evas/evas-3d-md2.c14
-rw-r--r--src/examples/evas/evas-3d-mmap-set.c16
-rw-r--r--src/examples/evas/evas-3d-obj.c14
-rw-r--r--src/examples/evas/evas-3d-pick.c10
-rw-r--r--src/examples/evas/evas-3d-ply.c14
-rw-r--r--src/examples/evas/evas-3d-proxy.c22
-rw-r--r--src/examples/evas/evas-3d-shadows.c14
-rw-r--r--src/examples/evas/evas-object-manipulation-eo.c40
-rw-r--r--src/examples/evas/evas_cxx_rectangle.cc2
14 files changed, 103 insertions, 103 deletions
diff --git a/src/examples/evas/evas-3d-aabb.c b/src/examples/evas/evas-3d-aabb.c
index 8791b75..9f9488a 100644
--- a/src/examples/evas/evas-3d-aabb.c
+++ b/src/examples/evas/evas-3d-aabb.c
@@ -112,8 +112,8 @@ _on_canvas_resize(Ecore_Evas *ee)
112 int w, h; 112 int w, h;
113 113
114 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 114 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
115 eo_do(background, evas_obj_size_set(w, h)); 115 eo_do(background, efl_gfx_size_set(w, h));
116 eo_do(image, evas_obj_size_set(w, h)); 116 eo_do(image, efl_gfx_size_set(w, h));
117} 117}
118 118
119static Eina_Bool 119static Eina_Bool
@@ -243,14 +243,14 @@ main(void)
243 243
244 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 244 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
245 eo_do(background, 245 eo_do(background,
246 evas_obj_color_set(0, 0, 0, 255), 246 efl_gfx_color_set(0, 0, 0, 255),
247 evas_obj_size_set(WIDTH, HEIGHT), 247 efl_gfx_size_set(WIDTH, HEIGHT),
248 evas_obj_visibility_set(EINA_TRUE)); 248 efl_gfx_visible_set(EINA_TRUE));
249 249
250 image = evas_object_image_filled_add(evas); 250 image = evas_object_image_filled_add(evas);
251 eo_do(image, 251 eo_do(image,
252 evas_obj_size_set(WIDTH, HEIGHT), 252 efl_gfx_size_set(WIDTH, HEIGHT),
253 evas_obj_visibility_set(EINA_TRUE)); 253 efl_gfx_visible_set(EINA_TRUE));
254 evas_object_focus_set(image, EINA_TRUE); 254 evas_object_focus_set(image, EINA_TRUE);
255 eo_do(image, evas_obj_image_scene_set(scene)); 255 eo_do(image, evas_obj_image_scene_set(scene));
256 256
diff --git a/src/examples/evas/evas-3d-blending.c b/src/examples/evas/evas-3d-blending.c
index d452483..5e47739 100644
--- a/src/examples/evas/evas-3d-blending.c
+++ b/src/examples/evas/evas-3d-blending.c
@@ -136,8 +136,8 @@ _on_canvas_resize(Ecore_Evas *ee)
136 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 136 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
137 137
138 evas_object_resize(background, w, h); 138 evas_object_resize(background, w, h);
139 eo_do(background, evas_obj_size_set(w, h)); 139 eo_do(background, efl_gfx_size_set(w, h));
140 eo_do(image, evas_obj_size_set(w, h)); 140 eo_do(image, efl_gfx_size_set(w, h));
141} 141}
142 142
143static Eina_Bool 143static Eina_Bool
diff --git a/src/examples/evas/evas-3d-cube.c b/src/examples/evas/evas-3d-cube.c
index bfe57e8..14a5ec8 100644
--- a/src/examples/evas/evas-3d-cube.c
+++ b/src/examples/evas/evas-3d-cube.c
@@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee)
110 int w, h; 110 int w, h;
111 111
112 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 112 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
113 eo_do(background, evas_obj_size_set(w, h)); 113 eo_do(background, efl_gfx_size_set(w, h));
114 eo_do(image, evas_obj_size_set(w, h)); 114 eo_do(image, efl_gfx_size_set(w, h));
115} 115}
116 116
117static Eina_Bool 117static Eina_Bool
@@ -260,15 +260,15 @@ main(void)
260 /* Add a background rectangle objects. */ 260 /* Add a background rectangle objects. */
261 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 261 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
262 eo_do(background, 262 eo_do(background,
263 evas_obj_color_set(0, 0, 0, 255), 263 efl_gfx_color_set(0, 0, 0, 255),
264 evas_obj_size_set(WIDTH, HEIGHT), 264 efl_gfx_size_set(WIDTH, HEIGHT),
265 evas_obj_visibility_set(EINA_TRUE)); 265 efl_gfx_visible_set(EINA_TRUE));
266 266
267 /* Add an image object for 3D scene rendering. */ 267 /* Add an image object for 3D scene rendering. */
268 image = evas_object_image_filled_add(evas); 268 image = evas_object_image_filled_add(evas);
269 eo_do(image, 269 eo_do(image,
270 evas_obj_size_set(WIDTH, HEIGHT), 270 efl_gfx_size_set(WIDTH, HEIGHT),
271 evas_obj_visibility_set(EINA_TRUE)); 271 efl_gfx_visible_set(EINA_TRUE));
272 272
273 /* Set the image object as render target for 3D scene. */ 273 /* Set the image object as render target for 3D scene. */
274 eo_do(image, evas_obj_image_scene_set(data.scene)); 274 eo_do(image, evas_obj_image_scene_set(data.scene));
diff --git a/src/examples/evas/evas-3d-cube2.c b/src/examples/evas/evas-3d-cube2.c
index 4a1afaa..aff4fdb 100644
--- a/src/examples/evas/evas-3d-cube2.c
+++ b/src/examples/evas/evas-3d-cube2.c
@@ -79,8 +79,8 @@ _on_canvas_resize(Ecore_Evas *ee)
79 int w, h; 79 int w, h;
80 80
81 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 81 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
82 eo_do(background, evas_obj_size_set(w, h)); 82 eo_do(background, efl_gfx_size_set(w, h));
83 eo_do(image, evas_obj_size_set(w, h)); 83 eo_do(image, efl_gfx_size_set(w, h));
84} 84}
85 85
86static Eina_Bool 86static Eina_Bool
@@ -259,15 +259,15 @@ main(void)
259 /* Add a background rectangle objects. */ 259 /* Add a background rectangle objects. */
260 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 260 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
261 eo_do(background, 261 eo_do(background,
262 evas_obj_color_set(0, 0, 0, 255), 262 efl_gfx_color_set(0, 0, 0, 255),
263 evas_obj_size_set(WIDTH, HEIGHT), 263 efl_gfx_size_set(WIDTH, HEIGHT),
264 evas_obj_visibility_set(EINA_TRUE)); 264 efl_gfx_visible_set(EINA_TRUE));
265 265
266 /* Add an image object for 3D scene rendering. */ 266 /* Add an image object for 3D scene rendering. */
267 image = evas_object_image_filled_add(evas); 267 image = evas_object_image_filled_add(evas);
268 eo_do(image, 268 eo_do(image,
269 evas_obj_size_set(WIDTH, HEIGHT), 269 efl_gfx_size_set(WIDTH, HEIGHT),
270 evas_obj_visibility_set(EINA_TRUE)); 270 efl_gfx_visible_set(EINA_TRUE));
271 271
272 /* Set the image object as render target for 3D scene. */ 272 /* Set the image object as render target for 3D scene. */
273 eo_do(image, evas_obj_image_scene_set(data.scene)); 273 eo_do(image, evas_obj_image_scene_set(data.scene));
diff --git a/src/examples/evas/evas-3d-eet.c b/src/examples/evas/evas-3d-eet.c
index 18dc2e4..4178a4e 100644
--- a/src/examples/evas/evas-3d-eet.c
+++ b/src/examples/evas/evas-3d-eet.c
@@ -93,8 +93,8 @@ _on_canvas_resize(Ecore_Evas *ee)
93 int w, h; 93 int w, h;
94 94
95 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 95 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
96 eo_do(background, evas_obj_size_set(w, h)); 96 eo_do(background, efl_gfx_size_set(w, h));
97 eo_do(image, evas_obj_size_set(w, h)); 97 eo_do(image, efl_gfx_size_set(w, h));
98} 98}
99 99
100int 100int
@@ -214,15 +214,15 @@ main(void)
214 /* Add a background rectangle objects. */ 214 /* Add a background rectangle objects. */
215 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 215 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
216 eo_do(background, 216 eo_do(background,
217 evas_obj_color_set(0, 0, 0, 255), 217 efl_gfx_color_set(0, 0, 0, 255),
218 evas_obj_size_set(WIDTH, HEIGHT), 218 efl_gfx_size_set(WIDTH, HEIGHT),
219 evas_obj_visibility_set(EINA_TRUE)); 219 efl_gfx_visible_set(EINA_TRUE));
220 220
221 /* Add an image object for 3D scene rendering. */ 221 /* Add an image object for 3D scene rendering. */
222 image = evas_object_image_filled_add(evas); 222 image = evas_object_image_filled_add(evas);
223 eo_do(image, 223 eo_do(image,
224 evas_obj_size_set(WIDTH, HEIGHT), 224 efl_gfx_size_set(WIDTH, HEIGHT),
225 evas_obj_visibility_set(EINA_TRUE)); 225 efl_gfx_visible_set(EINA_TRUE));
226 226
227 /* Set the image object as render target for 3D scene. */ 227 /* Set the image object as render target for 3D scene. */
228 eo_do(image, evas_obj_image_scene_set(scene)); 228 eo_do(image, evas_obj_image_scene_set(scene));
diff --git a/src/examples/evas/evas-3d-md2.c b/src/examples/evas/evas-3d-md2.c
index d48926c..428379d 100644
--- a/src/examples/evas/evas-3d-md2.c
+++ b/src/examples/evas/evas-3d-md2.c
@@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee)
68 int w, h; 68 int w, h;
69 69
70 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 70 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
71 eo_do(background, evas_obj_size_set(w, h)); 71 eo_do(background, efl_gfx_size_set(w, h));
72 eo_do(image, evas_obj_size_set(w, h)); 72 eo_do(image, efl_gfx_size_set(w, h));
73} 73}
74 74
75int 75int
@@ -178,15 +178,15 @@ main(void)
178 /* Add a background rectangle objects. */ 178 /* Add a background rectangle objects. */
179 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 179 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
180 eo_do(background, 180 eo_do(background,
181 evas_obj_color_set(0, 0, 0, 255), 181 efl_gfx_color_set(0, 0, 0, 255),
182 evas_obj_size_set(WIDTH, HEIGHT), 182 efl_gfx_size_set(WIDTH, HEIGHT),
183 evas_obj_visibility_set(EINA_TRUE)); 183 efl_gfx_visible_set(EINA_TRUE));
184 184
185 /* Add an image object for 3D scene rendering. */ 185 /* Add an image object for 3D scene rendering. */
186 image = evas_object_image_filled_add(evas); 186 image = evas_object_image_filled_add(evas);
187 eo_do(image, 187 eo_do(image,
188 evas_obj_size_set(WIDTH, HEIGHT), 188 efl_gfx_size_set(WIDTH, HEIGHT),
189 evas_obj_visibility_set(EINA_TRUE)); 189 efl_gfx_visible_set(EINA_TRUE));
190 190
191 /* Set the image object as render target for 3D scene. */ 191 /* Set the image object as render target for 3D scene. */
192 eo_do(image, evas_obj_image_scene_set(scene)); 192 eo_do(image, evas_obj_image_scene_set(scene));
diff --git a/src/examples/evas/evas-3d-mmap-set.c b/src/examples/evas/evas-3d-mmap-set.c
index 0855d76..ea93081 100644
--- a/src/examples/evas/evas-3d-mmap-set.c
+++ b/src/examples/evas/evas-3d-mmap-set.c
@@ -34,7 +34,7 @@
34 extention##_file = eina_file_open(buffer , 0); \ 34 extention##_file = eina_file_open(buffer , 0); \
35 mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \ 35 mesh_##extention = eo_add(EVAS_3D_MESH_CLASS, evas); \
36 eo_do(mesh_##extention, \ 36 eo_do(mesh_##extention, \
37 evas_3d_mesh_mmap_set(extention##_file, NULL), \ 37 efl_file_mmap_set(extention##_file, NULL), \
38 evas_3d_mesh_frame_material_set(0, material), \ 38 evas_3d_mesh_frame_material_set(0, material), \
39 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); \ 39 evas_3d_mesh_shade_mode_set(EVAS_3D_SHADE_MODE_PHONG)); \
40 node_##extention = eo_add(EVAS_3D_NODE_CLASS, evas, \ 40 node_##extention = eo_add(EVAS_3D_NODE_CLASS, evas, \
@@ -161,8 +161,8 @@ _on_canvas_resize(Ecore_Evas *ee)
161 int w, h; 161 int w, h;
162 162
163 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 163 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
164 eo_do(background, evas_obj_size_set(w, h)); 164 eo_do(background, efl_gfx_size_set(w, h));
165 eo_do(image, evas_obj_size_set(w, h)); 165 eo_do(image, efl_gfx_size_set(w, h));
166} 166}
167 167
168int 168int
@@ -258,15 +258,15 @@ main(void)
258 /* Add a background rectangle objects. */ 258 /* Add a background rectangle objects. */
259 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 259 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
260 eo_do(background, 260 eo_do(background,
261 evas_obj_color_set(20, 20, 200, 255), 261 efl_gfx_color_set(20, 20, 200, 255),
262 evas_obj_size_set(WIDTH, HEIGHT), 262 efl_gfx_size_set(WIDTH, HEIGHT),
263 evas_obj_visibility_set(EINA_TRUE)); 263 efl_gfx_visible_set(EINA_TRUE));
264 264
265 /* Add an image object for 3D scene rendering. */ 265 /* Add an image object for 3D scene rendering. */
266 image = evas_object_image_filled_add(evas); 266 image = evas_object_image_filled_add(evas);
267 eo_do(image, 267 eo_do(image,
268 evas_obj_size_set(WIDTH, HEIGHT), 268 efl_gfx_size_set(WIDTH, HEIGHT),
269 evas_obj_visibility_set(EINA_TRUE)); 269 efl_gfx_visible_set(EINA_TRUE));
270 270
271 /* Set the image object as render target for 3D scene. */ 271 /* Set the image object as render target for 3D scene. */
272 eo_do(image, evas_obj_image_scene_set(scene)); 272 eo_do(image, evas_obj_image_scene_set(scene));
diff --git a/src/examples/evas/evas-3d-obj.c b/src/examples/evas/evas-3d-obj.c
index 9676dff..406ac7f 100644
--- a/src/examples/evas/evas-3d-obj.c
+++ b/src/examples/evas/evas-3d-obj.c
@@ -139,8 +139,8 @@ _on_canvas_resize(Ecore_Evas *ee)
139 int w, h; 139 int w, h;
140 140
141 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 141 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
142 eo_do(background, evas_obj_size_set(w, h)); 142 eo_do(background, efl_gfx_size_set(w, h));
143 eo_do(image, evas_obj_size_set(w, h)); 143 eo_do(image, efl_gfx_size_set(w, h));
144} 144}
145 145
146int 146int
@@ -235,15 +235,15 @@ main(void)
235 /* Add a background rectangle MESHES. */ 235 /* Add a background rectangle MESHES. */
236 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 236 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
237 eo_do(background, 237 eo_do(background,
238 evas_obj_color_set(0, 0, 0, 255), 238 efl_gfx_color_set(0, 0, 0, 255),
239 evas_obj_size_set(WIDTH, HEIGHT), 239 efl_gfx_size_set(WIDTH, HEIGHT),
240 evas_obj_visibility_set(EINA_TRUE)); 240 efl_gfx_visible_set(EINA_TRUE));
241 241
242 /* Add an image object for 3D scene rendering. */ 242 /* Add an image object for 3D scene rendering. */
243 image = evas_object_image_filled_add(evas); 243 image = evas_object_image_filled_add(evas);
244 eo_do(image, 244 eo_do(image,
245 evas_obj_size_set(WIDTH, HEIGHT), 245 efl_gfx_size_set(WIDTH, HEIGHT),
246 evas_obj_visibility_set(EINA_TRUE)); 246 efl_gfx_visible_set(EINA_TRUE));
247 247
248 /* Set the image object as render target for 3D scene. */ 248 /* Set the image object as render target for 3D scene. */
249 eo_do(image, evas_obj_image_scene_set(scene)); 249 eo_do(image, evas_obj_image_scene_set(scene));
diff --git a/src/examples/evas/evas-3d-pick.c b/src/examples/evas/evas-3d-pick.c
index bcd9c84..49eda2c 100644
--- a/src/examples/evas/evas-3d-pick.c
+++ b/src/examples/evas/evas-3d-pick.c
@@ -199,15 +199,15 @@ main(void)
199 /* Add evas objects. */ 199 /* Add evas objects. */
200 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 200 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
201 eo_do(background, 201 eo_do(background,
202 evas_obj_color_set(0, 0, 0, 255), 202 efl_gfx_color_set(0, 0, 0, 255),
203 evas_obj_size_set(WIDTH, HEIGHT), 203 efl_gfx_size_set(WIDTH, HEIGHT),
204 evas_obj_visibility_set(EINA_TRUE)); 204 efl_gfx_visible_set(EINA_TRUE));
205 205
206 image = evas_object_image_filled_add(evas); 206 image = evas_object_image_filled_add(evas);
207 eo_do(image, 207 eo_do(image,
208 evas_obj_image_scene_set(scene), 208 evas_obj_image_scene_set(scene),
209 evas_obj_size_set(WIDTH, HEIGHT), 209 efl_gfx_size_set(WIDTH, HEIGHT),
210 evas_obj_visibility_set(EINA_TRUE)); 210 efl_gfx_visible_set(EINA_TRUE));
211 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, 211 evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN,
212 _on_mouse_down, NULL); 212 _on_mouse_down, NULL);
213 213
diff --git a/src/examples/evas/evas-3d-ply.c b/src/examples/evas/evas-3d-ply.c
index a64263b..502b3d6 100644
--- a/src/examples/evas/evas-3d-ply.c
+++ b/src/examples/evas/evas-3d-ply.c
@@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee)
91 int w, h; 91 int w, h;
92 92
93 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 93 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
94 eo_do(background, evas_obj_size_set(w, h)); 94 eo_do(background, efl_gfx_size_set(w, h));
95 eo_do(image, evas_obj_size_set(w, h)); 95 eo_do(image, efl_gfx_size_set(w, h));
96} 96}
97 97
98int 98int
@@ -227,15 +227,15 @@ main(void)
227 /* Add a background rectangle objects. */ 227 /* Add a background rectangle objects. */
228 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 228 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
229 eo_do(background, 229 eo_do(background,
230 evas_obj_color_set(100, 100, 100, 255), 230 efl_gfx_color_set(100, 100, 100, 255),
231 evas_obj_size_set(WIDTH, HEIGHT), 231 efl_gfx_size_set(WIDTH, HEIGHT),
232 evas_obj_visibility_set(EINA_TRUE)); 232 efl_gfx_visible_set(EINA_TRUE));
233 233
234 /* Add an image object for 3D scene rendering. */ 234 /* Add an image object for 3D scene rendering. */
235 image = evas_object_image_filled_add(evas); 235 image = evas_object_image_filled_add(evas);
236 eo_do(image, 236 eo_do(image,
237 evas_obj_size_set(WIDTH, HEIGHT), 237 efl_gfx_size_set(WIDTH, HEIGHT),
238 evas_obj_visibility_set(EINA_TRUE)); 238 efl_gfx_visible_set(EINA_TRUE));
239 239
240 /* Set the image object as render target for 3D scene. */ 240 /* Set the image object as render target for 3D scene. */
241 eo_do(image, evas_obj_image_scene_set(scene)); 241 eo_do(image, evas_obj_image_scene_set(scene));
diff --git a/src/examples/evas/evas-3d-proxy.c b/src/examples/evas/evas-3d-proxy.c
index 7fbe8e3..71ef979 100644
--- a/src/examples/evas/evas-3d-proxy.c
+++ b/src/examples/evas/evas-3d-proxy.c
@@ -56,8 +56,8 @@ _on_canvas_resize(Ecore_Evas *ee)
56 int w, h; 56 int w, h;
57 57
58 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 58 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
59 eo_do(background, evas_obj_size_set(w, h)); 59 eo_do(background, efl_gfx_size_set(w, h));
60 eo_do(image, evas_obj_size_set(w, h)); 60 eo_do(image, efl_gfx_size_set(w, h));
61} 61}
62 62
63static Eina_Bool 63static Eina_Bool
@@ -218,23 +218,23 @@ main(void)
218 /* Add a background rectangle objects. */ 218 /* Add a background rectangle objects. */
219 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 219 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
220 eo_do(background, 220 eo_do(background,
221 evas_obj_color_set(0, 0, 0, 255), 221 efl_gfx_color_set(0, 0, 0, 255),
222 evas_obj_size_set(WIDTH, HEIGHT), 222 efl_gfx_size_set(WIDTH, HEIGHT),
223 evas_obj_visibility_set(EINA_TRUE)); 223 efl_gfx_visible_set(EINA_TRUE));
224 224
225 /* Add a background image. */ 225 /* Add a background image. */
226 source = evas_object_image_filled_add(evas); 226 source = evas_object_image_filled_add(evas);
227 eo_do(source, 227 eo_do(source,
228 evas_obj_image_size_set(IMG_WIDTH, IMG_HEIGHT), 228 efl_gfx_view_size_set(IMG_WIDTH, IMG_HEIGHT),
229 evas_obj_position_set((WIDTH / 2), (HEIGHT / 2)), 229 efl_gfx_position_set((WIDTH / 2), (HEIGHT / 2)),
230 evas_obj_size_set((WIDTH / 2), (HEIGHT / 2)), 230 efl_gfx_size_set((WIDTH / 2), (HEIGHT / 2)),
231 evas_obj_visibility_set(EINA_TRUE)); 231 efl_gfx_visible_set(EINA_TRUE));
232 232
233 /* Add an image object for 3D scene rendering. */ 233 /* Add an image object for 3D scene rendering. */
234 image = evas_object_image_filled_add(evas); 234 image = evas_object_image_filled_add(evas);
235 eo_do(image, 235 eo_do(image,
236 evas_obj_size_set((WIDTH / 2), (HEIGHT / 2)), 236 efl_gfx_size_set((WIDTH / 2), (HEIGHT / 2)),
237 evas_obj_visibility_set(EINA_TRUE)); 237 efl_gfx_visible_set(EINA_TRUE));
238 238
239 /* Setup scene */ 239 /* Setup scene */
240 _scene_setup(&data); 240 _scene_setup(&data);
diff --git a/src/examples/evas/evas-3d-shadows.c b/src/examples/evas/evas-3d-shadows.c
index d53f435..c1eb087 100644
--- a/src/examples/evas/evas-3d-shadows.c
+++ b/src/examples/evas/evas-3d-shadows.c
@@ -147,8 +147,8 @@ _on_canvas_resize(Ecore_Evas *ee)
147 int w, h; 147 int w, h;
148 148
149 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 149 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
150 eo_do(background, evas_obj_size_set(w, h)); 150 eo_do(background, efl_gfx_size_set(w, h));
151 eo_do(image, evas_obj_size_set(w, h)); 151 eo_do(image, efl_gfx_size_set(w, h));
152} 152}
153 153
154static void 154static void
@@ -525,15 +525,15 @@ main(void)
525 /* Add a background rectangle objects. */ 525 /* Add a background rectangle objects. */
526 background = eo_add(EVAS_RECTANGLE_CLASS, evas); 526 background = eo_add(EVAS_RECTANGLE_CLASS, evas);
527 eo_do(background, 527 eo_do(background,
528 evas_obj_color_set(0, 0, 0, 255), 528 efl_gfx_color_set(0, 0, 0, 255),
529 evas_obj_size_set(WIDTH, HEIGHT), 529 efl_gfx_size_set(WIDTH, HEIGHT),
530 evas_obj_visibility_set(EINA_TRUE)); 530 efl_gfx_visible_set(EINA_TRUE));
531 531
532 /* Add an image object for 3D scene rendering. */ 532 /* Add an image object for 3D scene rendering. */
533 image = evas_object_image_filled_add(evas); 533 image = evas_object_image_filled_add(evas);
534 eo_do(image, 534 eo_do(image,
535 evas_obj_size_set(WIDTH, HEIGHT), 535 efl_gfx_size_set(WIDTH, HEIGHT),
536 evas_obj_visibility_set(EINA_TRUE)); 536 efl_gfx_visible_set(EINA_TRUE));
537 537
538 evas_object_focus_set(image, EINA_TRUE); 538 evas_object_focus_set(image, EINA_TRUE);
539 /* Set the image object as render target for 3D scene. */ 539 /* Set the image object as render target for 3D scene. */
diff --git a/src/examples/evas/evas-object-manipulation-eo.c b/src/examples/evas/evas-object-manipulation-eo.c
index 6bb2cbd..9f17ee8 100644
--- a/src/examples/evas/evas-object-manipulation-eo.c
+++ b/src/examples/evas/evas-object-manipulation-eo.c
@@ -59,7 +59,7 @@ _canvas_resize_cb(Ecore_Evas *ee)
59 int w, h; 59 int w, h;
60 60
61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); 61 ecore_evas_geometry_get(ee, NULL, NULL, &w, &h);
62 eo_do(d.bg, evas_obj_size_set(w, h)); 62 eo_do(d.bg, efl_gfx_size_set(w, h));
63} 63}
64 64
65static void 65static void
@@ -80,7 +80,7 @@ _on_keydown(void *data EINA_UNUSED,
80 { 80 {
81 int alpha, r, g, b; 81 int alpha, r, g, b;
82 82
83 eo_do(d.clipper, evas_obj_color_get(&r, &g, &b, &alpha)); 83 eo_do(d.clipper, efl_gfx_color_get(&r, &g, &b, &alpha));
84 evas_color_argb_unpremul(alpha, &r, &g, &b); 84 evas_color_argb_unpremul(alpha, &r, &g, &b);
85 85
86 alpha -= 20; 86 alpha -= 20;
@@ -88,7 +88,7 @@ _on_keydown(void *data EINA_UNUSED,
88 alpha = 255; 88 alpha = 255;
89 89
90 evas_color_argb_premul(alpha, &r, &g, &b); 90 evas_color_argb_premul(alpha, &r, &g, &b);
91 eo_do(d.clipper, evas_obj_color_set(r, g, b, alpha)); 91 eo_do(d.clipper, efl_gfx_color_set(r, g, b, alpha));
92 92
93 fprintf(stdout, "Changing clipper's opacity: %d%%\n", 93 fprintf(stdout, "Changing clipper's opacity: %d%%\n",
94 (int)((alpha / 255.0) * 100)); 94 (int)((alpha / 255.0) * 100));
@@ -102,7 +102,7 @@ _on_keydown(void *data EINA_UNUSED,
102 102
103 fprintf(stdout, "Changing clipper's color to"); 103 fprintf(stdout, "Changing clipper's color to");
104 104
105 eo_do(d.clipper, evas_obj_color_get(&r, &g, &b, &alpha)); 105 eo_do(d.clipper, efl_gfx_color_get(&r, &g, &b, &alpha));
106 evas_color_argb_unpremul(alpha, &r, &g, &b); 106 evas_color_argb_unpremul(alpha, &r, &g, &b);
107 107
108 if (g > 0) 108 if (g > 0)
@@ -117,7 +117,7 @@ _on_keydown(void *data EINA_UNUSED,
117 } 117 }
118 118
119 evas_color_argb_premul(alpha, &r, &g, &b); 119 evas_color_argb_premul(alpha, &r, &g, &b);
120 eo_do(d.clipper, evas_obj_color_set(r, g, b, alpha)); 120 eo_do(d.clipper, efl_gfx_color_set(r, g, b, alpha));
121 return; 121 return;
122 } 122 }
123 123
@@ -145,8 +145,8 @@ _on_keydown(void *data EINA_UNUSED,
145 Eina_Bool visibility; 145 Eina_Bool visibility;
146 /* Don't use "get"-"set" expressions in one eo_do call, 146 /* Don't use "get"-"set" expressions in one eo_do call,
147 * if you pass parameter to "set" by value. */ 147 * if you pass parameter to "set" by value. */
148 eo_do(d.clipper, visibility = evas_obj_visibility_get()); 148 eo_do(d.clipper, visibility = efl_gfx_visible_get());
149 eo_do(d.clipper, evas_obj_visibility_set(!visibility)); 149 eo_do(d.clipper, efl_gfx_visible_set(!visibility));
150 fprintf(stdout, "Clipper is now %s\n", visibility ? "hidden" : "visible"); 150 fprintf(stdout, "Clipper is now %s\n", visibility ? "hidden" : "visible");
151 return; 151 return;
152 } 152 }
@@ -178,10 +178,10 @@ main(void)
178 178
179 /* Eo-styled way to perform actions on an object*/ 179 /* Eo-styled way to perform actions on an object*/
180 eo_do(d.bg, evas_obj_name_set("background rectangle"), 180 eo_do(d.bg, evas_obj_name_set("background rectangle"),
181 evas_obj_color_set(255, 255, 255, 255), /* white bg */ 181 efl_gfx_color_set(255, 255, 255, 255), /* white bg */
182 evas_obj_position_set(0, 0), /* at canvas' origin */ 182 efl_gfx_position_set(0, 0), /* at canvas' origin */
183 evas_obj_size_set(WIDTH, HEIGHT), /* covers full canvas */ 183 efl_gfx_size_set(WIDTH, HEIGHT), /* covers full canvas */
184 evas_obj_visibility_set(EINA_TRUE), 184 efl_gfx_visible_set(EINA_TRUE),
185 evas_obj_focus_set(EINA_TRUE)); 185 evas_obj_focus_set(EINA_TRUE));
186 186
187 evas_object_event_callback_add( 187 evas_object_event_callback_add(
@@ -204,9 +204,9 @@ main(void)
204 } 204 }
205 else 205 else
206 { 206 {
207 eo_do(d.img, evas_obj_position_set(0, 0), 207 eo_do(d.img, efl_gfx_position_set(0, 0),
208 evas_obj_size_set(WIDTH, HEIGHT), 208 efl_gfx_size_set(WIDTH, HEIGHT),
209 evas_obj_visibility_set(EINA_TRUE)); 209 efl_gfx_visible_set(EINA_TRUE));
210 210
211 const char *type = NULL; 211 const char *type = NULL;
212 eo_do(d.img, type = evas_obj_type_get()); 212 eo_do(d.img, type = evas_obj_type_get());
@@ -228,9 +228,9 @@ main(void)
228 eo_do(d.clipper_border, 228 eo_do(d.clipper_border,
229 evas_obj_image_border_set(3, 3, 3, 3), 229 evas_obj_image_border_set(3, 3, 3, 3),
230 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_NONE), 230 evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_NONE),
231 evas_obj_position_set((WIDTH / 4) -3, (HEIGHT / 4) - 3), 231 efl_gfx_position_set((WIDTH / 4) -3, (HEIGHT / 4) - 3),
232 evas_obj_size_set((WIDTH / 2) + 6, (HEIGHT / 2) + 6), 232 efl_gfx_size_set((WIDTH / 2) + 6, (HEIGHT / 2) + 6),
233 evas_obj_visibility_set(EINA_TRUE)); 233 efl_gfx_visible_set(EINA_TRUE));
234 } 234 }
235 /* solid white clipper (note that it's the default color for a 235 /* solid white clipper (note that it's the default color for a
236 * rectangle) - it won't change clippees' colors, then (multiplying 236 * rectangle) - it won't change clippees' colors, then (multiplying
@@ -238,9 +238,9 @@ main(void)
238 d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); 238 d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas);
239 239
240 eo_do(d.clipper, 240 eo_do(d.clipper,
241 evas_obj_position_set( WIDTH / 4, HEIGHT / 4), 241 efl_gfx_position_set( WIDTH / 4, HEIGHT / 4),
242 evas_obj_size_set(WIDTH / 2, HEIGHT / 2), 242 efl_gfx_size_set(WIDTH / 2, HEIGHT / 2),
243 evas_obj_visibility_set(EINA_TRUE)); 243 efl_gfx_visible_set(EINA_TRUE));
244 244
245 eo_do(d.img, evas_obj_clip_set(d.clipper)); 245 eo_do(d.img, evas_obj_clip_set(d.clipper));
246 246
diff --git a/src/examples/evas/evas_cxx_rectangle.cc b/src/examples/evas/evas_cxx_rectangle.cc
index d307200..d41902f 100644
--- a/src/examples/evas/evas_cxx_rectangle.cc
+++ b/src/examples/evas/evas_cxx_rectangle.cc
@@ -44,7 +44,7 @@ int main()
44 rect.color_set(255, 0, 0, 255); 44 rect.color_set(255, 0, 0, 255);
45 rect.position_set(10, 10); 45 rect.position_set(10, 10);
46 rect.size_set(100, 100); 46 rect.size_set(100, 100);
47 rect.visibility_set(true); 47 rect.visible_set(true);
48 canvas.render(); 48 canvas.render();
49 } 49 }
50 50