efl: Use Eina.Size2D for Efl.Gfx.size
Big patch as a lot of things call or reimplement size_set. Hopefully I got it right... fingers crossed.
This commit is contained in:
parent
065fbec948
commit
b331ec013e
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue