hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evas: Rename Evas.Rectangle as Efl.Canvas.Rectangle

This commit is contained in:
Jean-Philippe Andre 2016-06-02 18:55:51 +09:00
parent aec0cb9a67
commit 915e09aed3
23 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Evas.am
View File

@ -4,7 +4,7 @@
evas_eolian_pub_files = \ evas_eolian_pub_files = \
lib/evas/canvas/evas_object.eo \ lib/evas/canvas/evas_object.eo \
lib/evas/canvas/efl_canvas_polygon.eo \ lib/evas/canvas/efl_canvas_polygon.eo \
lib/evas/canvas/evas_rectangle.eo \ lib/evas/canvas/efl_canvas_rectangle.eo \
lib/evas/canvas/evas_textblock.eo \ lib/evas/canvas/evas_textblock.eo \
lib/evas/canvas/evas_signal_interface.eo \ lib/evas/canvas/evas_signal_interface.eo \
lib/evas/canvas/evas_object_smart.eo \ lib/evas/canvas/evas_object_smart.eo \

2
src/examples/evas/evas-3d-aabb.c
View File

@ -215,7 +215,7 @@ main(void)
evas_canvas3d_scene_camera_node_set(scene, camera_node); evas_canvas3d_scene_camera_node_set(scene, camera_node);
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-cube.c
View File

@ -233,7 +233,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-cube2.c
View File

@ -234,7 +234,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-eet.c
View File

@ -186,7 +186,7 @@ main(void)
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-fog.c
View File

@ -207,7 +207,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-hull.c
View File

@ -429,7 +429,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-md2.c
View File

@ -152,7 +152,7 @@ main(void)
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-mmap-set.c
View File

@ -233,7 +233,7 @@ main(void)
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 20, 20, 200, 255); efl_gfx_color_set(background, 20, 20, 200, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-obj.c
View File

@ -212,7 +212,7 @@ main(void)
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
/* Add a background rectangle MESHES. */ /* Add a background rectangle MESHES. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-parallax-occlusion.c
View File

@ -237,7 +237,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-pick.c
View File

@ -167,7 +167,7 @@ main(void)
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
/* Add evas objects. */ /* Add evas objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-ply.c
View File

@ -208,7 +208,7 @@ main(void)
evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT); evas_canvas3d_scene_size_set(scene, WIDTH, HEIGHT);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 100, 100, 100, 255); efl_gfx_color_set(background, 100, 100, 100, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-proxy.c
View File

@ -214,7 +214,7 @@ main(void)
evas = ecore_evas_get(ecore_evas); evas = ecore_evas_get(ecore_evas);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-shadows.c
View File

@ -639,7 +639,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

2
src/examples/evas/evas-3d-static-lod.c
View File

@ -251,7 +251,7 @@ main(void)
_scene_setup(&data); _scene_setup(&data);
/* Add a background rectangle objects. */ /* Add a background rectangle objects. */
background = eo_add(EVAS_RECTANGLE_CLASS, evas); background = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
efl_gfx_color_set(background, 0, 0, 0, 255); efl_gfx_color_set(background, 0, 0, 0, 255);
efl_gfx_size_set(background, WIDTH, HEIGHT); efl_gfx_size_set(background, WIDTH, HEIGHT);
efl_gfx_visible_set(background, EINA_TRUE); efl_gfx_visible_set(background, EINA_TRUE);

4
src/examples/evas/evas-object-manipulation-eo.c
View File

@ -174,7 +174,7 @@ main(void)
/* Creating object with Eo. /* Creating object with Eo.
* Object must be deleted explixitly at the end of program.*/ * Object must be deleted explixitly at the end of program.*/
d.bg = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); d.bg = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
/* Eo-styled way to perform actions on an object*/ /* Eo-styled way to perform actions on an object*/
evas_obj_name_set(d.bg, "background rectangle"); evas_obj_name_set(d.bg, "background rectangle");
@ -235,7 +235,7 @@ main(void)
/* solid white clipper (note that it's the default color for a /* solid white clipper (note that it's the default color for a
* rectangle) - it won't change clippees' colors, then (multiplying * rectangle) - it won't change clippees' colors, then (multiplying
* by 255) */ * by 255) */
d.clipper = eo_add(EVAS_RECTANGLE_CLASS, d.canvas); d.clipper = eo_add(EFL_CANVAS_RECTANGLE_CLASS, d.canvas);
efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4); efl_gfx_position_set(d.clipper, WIDTH / 4, HEIGHT / 4);
efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2); efl_gfx_size_set(d.clipper, WIDTH / 2, HEIGHT / 2);

2
src/lib/evas/Evas_Eo.h
View File

@ -24,7 +24,7 @@
* *
* @{ * @{
*/ */
#include "canvas/evas_rectangle.eo.h" #include "canvas/efl_canvas_rectangle.eo.h"
/** /**
* @} * @}
*/ */

2
src/lib/evas/Evas_Legacy.h
View File

@ -1831,7 +1831,7 @@ EAPI void *evas_object_intercept_focus_set_callback_del(Evas_Object *obj, Evas_O
*/ */
EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC; EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
#include "canvas/evas_rectangle.eo.legacy.h" #include "canvas/efl_canvas_rectangle.eo.legacy.h"
/** /**
* @} * @}

6
src/lib/evas/canvas/efl_canvas_rectangle.eo Normal file
View File

@ -0,0 +1,6 @@
class Efl.Canvas.Rectangle (Evas.Object)
{
implements {
Eo.Base.constructor;
}
}

18
src/lib/evas/canvas/evas_object_rectangle.c
View File

@ -3,7 +3,7 @@
#include "evas_render2.h" #include "evas_render2.h"
#define MY_CLASS EVAS_RECTANGLE_CLASS #define MY_CLASS EFL_CANVAS_RECTANGLE_CLASS
/* private magic number for rectangle objects */ /* private magic number for rectangle objects */
static const char o_type[] = "rectangle"; static const char o_type[] = "rectangle";
@ -11,9 +11,9 @@ static const char o_type[] = "rectangle";
const char *o_rect_type = o_type; const char *o_rect_type = o_type;
/* private struct for rectangle object internal data */ /* private struct for rectangle object internal data */
typedef struct _Evas_Rectangle_Data Evas_Rectangle_Data; typedef struct _Efl_Canvas_Rectangle_Data Efl_Canvas_Rectangle_Data;
struct _Evas_Rectangle_Data struct _Efl_Canvas_Rectangle_Data
{ {
void *engine_data; void *engine_data;
}; };
@ -95,12 +95,12 @@ evas_object_rectangle_add(Evas *e)
MAGIC_CHECK(e, Evas, MAGIC_EVAS); MAGIC_CHECK(e, Evas, MAGIC_EVAS);
return NULL; return NULL;
MAGIC_CHECK_END(); MAGIC_CHECK_END();
Evas_Object *eo_obj = eo_add(EVAS_RECTANGLE_CLASS, e); Evas_Object *eo_obj = eo_add(EFL_CANVAS_RECTANGLE_CLASS, e);
return eo_obj; return eo_obj;
} }
EOLIAN static Eo * EOLIAN static Eo *
_evas_rectangle_eo_base_constructor(Eo *eo_obj, Evas_Rectangle_Data *class_data EINA_UNUSED) _efl_canvas_rectangle_eo_base_constructor(Eo *eo_obj, Efl_Canvas_Rectangle_Data *class_data EINA_UNUSED)
{ {
eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS)); eo_obj = eo_constructor(eo_super(eo_obj, MY_CLASS));
@ -381,21 +381,21 @@ evas_object_rectangle_was_opaque(Evas_Object *eo_obj EINA_UNUSED,
static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj) static unsigned int evas_object_rectangle_id_get(Evas_Object *eo_obj)
{ {
Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
if (!o) return 0; if (!o) return 0;
return MAGIC_OBJ_RECTANGLE; return MAGIC_OBJ_RECTANGLE;
} }
static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj) static unsigned int evas_object_rectangle_visual_id_get(Evas_Object *eo_obj)
{ {
Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
if (!o) return 0; if (!o) return 0;
return MAGIC_OBJ_SHAPE; return MAGIC_OBJ_SHAPE;
} }
static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj) static void *evas_object_rectangle_engine_data_get(Evas_Object *eo_obj)
{ {
Evas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS); Efl_Canvas_Rectangle_Data *o = eo_data_scope_get(eo_obj, MY_CLASS);
return o->engine_data; return o->engine_data;
} }
@ -450,4 +450,4 @@ evas_object_rectangle_was_inside(Evas_Object *eo_obj, double x, double y)
} }
#endif #endif
#include "canvas/evas_rectangle.eo.c" #include "canvas/efl_canvas_rectangle.eo.c"

8
src/lib/evas/canvas/evas_rectangle.eo
View File

@ -1,8 +0,0 @@
class Evas.Rectangle (Evas.Object)
{
legacy_prefix: evas_object_rectangle;
eo_prefix: evas_obj_rectangle;
implements {
Eo.Base.constructor;
}
}

2
src/tests/edje/edje_test_edje.c
View File

@ -664,7 +664,7 @@ START_TEST(edje_test_table_eoapi)
for (k = 0; k < 2; k++) for (k = 0; k < 2; k++)
{ {
i = l*2 + k; i = l*2 + k;
sobjs[i] = eo_add(EVAS_RECTANGLE_CLASS, evas); sobjs[i] = eo_add(EFL_CANVAS_RECTANGLE_CLASS, evas);
fail_if(!sobjs[i]); fail_if(!sobjs[i]);
efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1); efl_pack_grid(efl_part(obj, "table"), sobjs[i], k, l + 2, 1, 1);
} }