diff --git a/unsorted/elementary/evas3d_object_on_button_example.c b/unsorted/elementary/evas3d_object_on_button_example.c index e4e1c43c..c3866b78 100644 --- a/unsorted/elementary/evas3d_object_on_button_example.c +++ b/unsorted/elementary/evas3d_object_on_button_example.c @@ -258,7 +258,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); btn = elm_button_add(win); diff --git a/unsorted/evas/evas-3d-aabb.c b/unsorted/evas/evas-3d-aabb.c index 37f954da..fac73ad9 100644 --- a/unsorted/evas/evas-3d-aabb.c +++ b/unsorted/evas/evas-3d-aabb.c @@ -110,8 +110,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -216,11 +216,11 @@ main(void) background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); efl_canvas_scene3d_set(image, scene); diff --git a/unsorted/evas/evas-3d-blending.c b/unsorted/evas/evas-3d-blending.c index 8409efa2..84f042ac 100644 --- a/unsorted/evas/evas-3d-blending.c +++ b/unsorted/evas/evas-3d-blending.c @@ -126,8 +126,8 @@ _on_canvas_resize(Ecore_Evas *ee) ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); evas_object_resize(background, w, h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool diff --git a/unsorted/evas/evas-3d-colorpick.c b/unsorted/evas/evas-3d-colorpick.c index 447ae0c8..142af345 100644 --- a/unsorted/evas/evas-3d-colorpick.c +++ b/unsorted/evas/evas-3d-colorpick.c @@ -120,8 +120,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(bg, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(bg, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -392,7 +392,7 @@ int main(int argc, char **argv) image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); efl_canvas_scene3d_set(image, globalscene.scene); diff --git a/unsorted/evas/evas-3d-cube.c b/unsorted/evas/evas-3d-cube.c index f82e9bf5..7a2cdcfd 100644 --- a/unsorted/evas/evas-3d-cube.c +++ b/unsorted/evas/evas-3d-cube.c @@ -114,8 +114,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -239,12 +239,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-cube2.c b/unsorted/evas/evas-3d-cube2.c index 0392c957..f581d930 100644 --- a/unsorted/evas/evas-3d-cube2.c +++ b/unsorted/evas/evas-3d-cube2.c @@ -78,8 +78,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -235,12 +235,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-eet.c b/unsorted/evas/evas-3d-eet.c index 2d73c89a..01c9c768 100644 --- a/unsorted/evas/evas-3d-eet.c +++ b/unsorted/evas/evas-3d-eet.c @@ -91,8 +91,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } int @@ -187,12 +187,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-fog.c b/unsorted/evas/evas-3d-fog.c index 94248d4d..38a3d632 100644 --- a/unsorted/evas/evas-3d-fog.c +++ b/unsorted/evas/evas-3d-fog.c @@ -61,8 +61,8 @@ _on_canvas_resize(Ecore_Evas *ee) ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); evas_object_resize(background, w, h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -212,13 +212,13 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-hull.c b/unsorted/evas/evas-3d-hull.c index d842a48b..52c121fe 100644 --- a/unsorted/evas/evas-3d-hull.c +++ b/unsorted/evas/evas-3d-hull.c @@ -195,8 +195,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -433,12 +433,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_show(image), diff --git a/unsorted/evas/evas-3d-md2.c b/unsorted/evas/evas-3d-md2.c index 7a5c06cf..463c436d 100644 --- a/unsorted/evas/evas-3d-md2.c +++ b/unsorted/evas/evas-3d-md2.c @@ -68,8 +68,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } int @@ -154,12 +154,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-mmap-set.c b/unsorted/evas/evas-3d-mmap-set.c index 5bce02b2..fed41fa7 100644 --- a/unsorted/evas/evas-3d-mmap-set.c +++ b/unsorted/evas/evas-3d-mmap-set.c @@ -155,8 +155,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } int @@ -235,12 +235,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 20, 20, 200, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-obj.c b/unsorted/evas/evas-3d-obj.c index de4a1f30..76a263ba 100644 --- a/unsorted/evas/evas-3d-obj.c +++ b/unsorted/evas/evas-3d-obj.c @@ -133,8 +133,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } int @@ -216,12 +216,12 @@ main(void) /* Add a background rectangle MESHES. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-parallax-occlusion.c b/unsorted/evas/evas-3d-parallax-occlusion.c index 1d679087..9640f240 100644 --- a/unsorted/evas/evas-3d-parallax-occlusion.c +++ b/unsorted/evas/evas-3d-parallax-occlusion.c @@ -80,8 +80,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -239,12 +239,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); diff --git a/unsorted/evas/evas-3d-pick.c b/unsorted/evas/evas-3d-pick.c index 2556d563..b6d20e71 100644 --- a/unsorted/evas/evas-3d-pick.c +++ b/unsorted/evas/evas-3d-pick.c @@ -169,12 +169,12 @@ main(void) /* Add evas objects. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); efl_canvas_scene3d_set(image, scene); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_event_callback_add(image, EVAS_CALLBACK_MOUSE_DOWN, _on_mouse_down, NULL); diff --git a/unsorted/evas/evas-3d-ply.c b/unsorted/evas/evas-3d-ply.c index d42e3704..00d05f98 100644 --- a/unsorted/evas/evas-3d-ply.c +++ b/unsorted/evas/evas-3d-ply.c @@ -98,8 +98,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } int @@ -210,12 +210,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 100, 100, 100, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-3d-proxy.c b/unsorted/evas/evas-3d-proxy.c index 74b6d0b3..3c89ebea 100644 --- a/unsorted/evas/evas-3d-proxy.c +++ b/unsorted/evas/evas-3d-proxy.c @@ -63,8 +63,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -221,7 +221,7 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add a background image. */ @@ -229,7 +229,7 @@ main(void) source = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); efl_gfx_buffer_copy_set(source, NULL, IMG_WIDTH, IMG_HEIGHT, 0, EFL_GFX_COLORSPACE_ARGB8888, 0); efl_gfx_position_set(source, EINA_POSITION2D((WIDTH / 2), (HEIGHT / 2))); - efl_gfx_size_set(source, (WIDTH / 2), (HEIGHT / 2)); + efl_gfx_size_set(source, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); efl_gfx_visible_set(source, EINA_TRUE); #else source = evas_object_image_filled_add(evas); @@ -241,7 +241,7 @@ main(void) /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, (WIDTH / 2), (HEIGHT / 2)); + efl_gfx_size_set(image, EINA_SIZE2D((WIDTH / 2), (HEIGHT / 2))); efl_gfx_visible_set(image, EINA_TRUE); /* Setup scene */ diff --git a/unsorted/evas/evas-3d-shadows.c b/unsorted/evas/evas-3d-shadows.c index c1714e3a..f24824eb 100644 --- a/unsorted/evas/evas-3d-shadows.c +++ b/unsorted/evas/evas-3d-shadows.c @@ -181,8 +181,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static void @@ -644,12 +644,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_anti_alias_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); diff --git a/unsorted/evas/evas-3d-static-lod.c b/unsorted/evas/evas-3d-static-lod.c index c2366b7c..22f7494c 100644 --- a/unsorted/evas/evas-3d-static-lod.c +++ b/unsorted/evas/evas-3d-static-lod.c @@ -66,8 +66,8 @@ _on_canvas_resize(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(background, w, h); - efl_gfx_size_set(image, w, h); + efl_gfx_size_set(background, EINA_SIZE2D(w, h)); + efl_gfx_size_set(image, EINA_SIZE2D(w, h)); } static Eina_Bool @@ -256,12 +256,12 @@ main(void) /* Add a background rectangle object. */ background = efl_add(EFL_CANVAS_RECTANGLE_CLASS, evas); efl_gfx_color_set(background, 0, 0, 0, 255); - efl_gfx_size_set(background, WIDTH, HEIGHT); + efl_gfx_size_set(background, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(background, EINA_TRUE); /* Add an image object for 3D scene rendering. */ image = efl_add(EFL_CANVAS_SCENE3D_CLASS, evas); - efl_gfx_size_set(image, WIDTH, HEIGHT); + efl_gfx_size_set(image, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(image, EINA_TRUE); evas_object_focus_set(image, EINA_TRUE); /* Set the image object as render target for 3D scene. */ diff --git a/unsorted/evas/evas-map-utils-eo.c b/unsorted/evas/evas-map-utils-eo.c index f6e321f5..34fae5e5 100644 --- a/unsorted/evas/evas-map-utils-eo.c +++ b/unsorted/evas/evas-map-utils-eo.c @@ -90,7 +90,7 @@ _anim_cb(void *data) o = evas_object_name_find(ad->canvas, "obj2"); - efl_gfx_size_get(o, NULL, &h); + h = efl_gfx_size_get(o).h; efl_gfx_map_reset(o); efl_gfx_map_smooth_set(o, ad->smooth); efl_gfx_map_alpha_set(o, ad->alpha); @@ -105,7 +105,7 @@ _anim_cb(void *data) o = evas_object_name_find(ad->canvas, "obj3"); - efl_gfx_size_get(o, &w, &h); + EINA_SIZE2D(w, h) = efl_gfx_size_get(o); efl_gfx_map_reset(o); efl_gfx_map_smooth_set(o, ad->smooth); efl_gfx_map_alpha_set(o, ad->alpha); diff --git a/unsorted/evas/evas-object-manipulation-eo.c b/unsorted/evas/evas-object-manipulation-eo.c index 3dad0d76..dfe02bb0 100644 --- a/unsorted/evas/evas-object-manipulation-eo.c +++ b/unsorted/evas/evas-object-manipulation-eo.c @@ -55,7 +55,7 @@ _canvas_resize_cb(Ecore_Evas *ee) int w, h; ecore_evas_geometry_get(ee, NULL, NULL, &w, &h); - efl_gfx_size_set(d.bg, w, h); + efl_gfx_size_set(d.bg, EINA_SIZE2D(w, h)); } static void @@ -178,7 +178,7 @@ main(void) /* white bg */ efl_gfx_position_set(d.bg, EINA_POSITION2D(0, 0)); /* at canvas' origin */ - efl_gfx_size_set(d.bg, WIDTH, HEIGHT); + efl_gfx_size_set(d.bg, EINA_SIZE2D(WIDTH, HEIGHT)); /* covers full canvas */ efl_gfx_visible_set(d.bg, EINA_TRUE); evas_object_focus_set(d.bg, EINA_TRUE); @@ -203,7 +203,7 @@ main(void) else { efl_gfx_position_set(d.img, EINA_POSITION2D(0, 0)); - efl_gfx_size_set(d.img, WIDTH, HEIGHT); + efl_gfx_size_set(d.img, EINA_SIZE2D(WIDTH, HEIGHT)); efl_gfx_visible_set(d.img, EINA_TRUE); printf("Image object added, class name is: %s\n", efl_class_name_get(d.img)); @@ -223,7 +223,7 @@ main(void) efl_image_border_set(d.clipper_border, 3, 3, 3, 3); efl_image_border_center_fill_set(d.clipper_border, EFL_GFX_BORDER_FILL_MODE_NONE); efl_gfx_position_set(d.clipper_border, EINA_POSITION2D((WIDTH / 4) -3, (HEIGHT / 4) - 3)); - efl_gfx_size_set(d.clipper_border, (WIDTH / 2) + 6, (HEIGHT / 2) + 6); + efl_gfx_size_set(d.clipper_border, EINA_SIZE2D((WIDTH / 2) + 6, (HEIGHT / 2) + 6)); efl_gfx_visible_set(d.clipper_border, EINA_TRUE); } @@ -233,7 +233,7 @@ main(void) d.clipper = efl_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas); efl_gfx_position_set(d.clipper, EINA_POSITION2D(WIDTH / 4, HEIGHT / 4)); - efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); + efl_gfx_size_set(d.clipper, EINA_SIZE2D(WIDTH / 2, HEIGHT / 2)); efl_gfx_visible_set(d.clipper, EINA_TRUE); efl_canvas_object_clip_set(d.img, d.clipper);