diff --git a/src/bin/about.c b/src/bin/about.c
index f36fdbc..084bd41 100644
--- a/src/bin/about.c
+++ b/src/bin/about.c
@@ -8,10 +8,10 @@ _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
- o = evas_object_textblock_add(evas);
- evas_object_move(o, 10, 40);
- evas_object_resize(o, win_w - 20, win_h - 50);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
+ eo_do(o, evas_obj_position_set(10, 40),
+ evas_obj_size_set(win_w - 20, win_h - 50),
+ evas_obj_visibility_set(EINA_TRUE));
st = evas_textblock_style_new();
evas_textblock_style_set
(st,
@@ -21,12 +21,10 @@ _setup(void)
"p='+ font=Vera font_size=10 align=left'"
"/p='- \n \n'"
);
- evas_object_textblock_style_set(o, st);
- evas_textblock_style_free(st);
- evas_object_textblock_clear(o);
- evas_object_textblock_text_markup_set
- (o,
- "
"
+ eo_do(o, evas_obj_textblock_style_set(st),
+ evas_obj_textblock_clear(),
+ evas_obj_textblock_text_markup_set
+ (""
"Enlightenment used to be a window manager project, but "
"since has changed a lot to become a miniature desktop and mobile "
"device environment all of its own. It is now made up of many "
@@ -43,7 +41,8 @@ _setup(void)
"layout descriptions that applications set up, dealing with the hard "
"work of doing the drawing for them."
""
- );
+ ));
+ evas_textblock_style_free(st);
o_text = o;
ui_fps(0.0);
}
@@ -51,7 +50,7 @@ _setup(void)
static void
_cleanup(void)
{
- evas_object_del(o_text);
+ eo_del(o_text);
o_text = NULL;
}
diff --git a/src/bin/filter_object_blur.c b/src/bin/filter_object_blur.c
index a7bac9b..27f6e2a 100644
--- a/src/bin/filter_object_blur.c
+++ b/src/bin/filter_object_blur.c
@@ -24,15 +24,15 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_BLUR);
- evas_object_filter_param_int_set(o, "radius", 3);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_BLUR);
+ evas_object_filter_param_int_set(o, "radius", 3);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_blur_solid.c b/src/bin/filter_object_blur_solid.c
index b61fd2c..c2e718e 100644
--- a/src/bin/filter_object_blur_solid.c
+++ b/src/bin/filter_object_blur_solid.c
@@ -24,16 +24,16 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_BLUR);
- evas_object_filter_param_int_set(o, "radius", 5);
- evas_object_layer_set(o,1);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_BLUR);
+ evas_object_filter_param_int_set(o, "radius", 5);
+ eo_do(o, evas_obj_layer_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -43,7 +43,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -59,7 +59,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_brightness.c b/src/bin/filter_object_brightness.c
index a1d5ef6..4606200 100644
--- a/src/bin/filter_object_brightness.c
+++ b/src/bin/filter_object_brightness.c
@@ -24,15 +24,15 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
- evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
+ evas_object_filter_param_float_set(o, "adjust", i / (double)OBNUM);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
evas_object_filter_param_float_set(o_images[i], "adjust",
((i + f) % OBNUM) / (2.0 * OBNUM) - 1);
}
diff --git a/src/bin/filter_object_brightness_solid.c b/src/bin/filter_object_brightness_solid.c
index 849482e..43fd173 100644
--- a/src/bin/filter_object_brightness_solid.c
+++ b/src/bin/filter_object_brightness_solid.c
@@ -24,17 +24,17 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
- evas_object_filter_param_float_set(o, "adjust",
- i / (2.0 * OBNUM) - 1.0);
- evas_object_layer_set(o,1);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_BRIGHTNESS);
+ evas_object_filter_param_float_set(o, "adjust",
+ i / (2.0 * OBNUM) - 1.0);
+ eo_do(o, evas_obj_layer_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -44,7 +44,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -60,7 +60,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
evas_object_filter_param_float_set(o_images[i], "adjust",
(((i + f) % OBNUM) * 2.0) / (OBNUM) - 1.0);
}
diff --git a/src/bin/filter_object_colors.c b/src/bin/filter_object_colors.c
index 2b66799..f05c3cc 100644
--- a/src/bin/filter_object_colors.c
+++ b/src/bin/filter_object_colors.c
@@ -29,12 +29,12 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
evas_object_filter_set(o, filters[i % 3]);
- evas_object_show(o);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
src = o;
o_images[i] = src;
}
@@ -46,7 +46,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_colors_solid.c b/src/bin/filter_object_colors_solid.c
index 534ab81..95d18f8 100644
--- a/src/bin/filter_object_colors_solid.c
+++ b/src/bin/filter_object_colors_solid.c
@@ -29,13 +29,13 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
evas_object_filter_set(o, filters[i % 3]);
- evas_object_layer_set(o,1);
- evas_object_show(o);
+ eo_do(o, evas_obj_layer_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
src = o;
o_images[i] = src;
}
@@ -47,7 +47,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -63,7 +63,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_greyscale.c b/src/bin/filter_object_greyscale.c
index 0d41ddd..749f89c 100644
--- a/src/bin/filter_object_greyscale.c
+++ b/src/bin/filter_object_greyscale.c
@@ -24,14 +24,14 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_greyscale_solid.c b/src/bin/filter_object_greyscale_solid.c
index 98373f5..b2695d5 100644
--- a/src/bin/filter_object_greyscale_solid.c
+++ b/src/bin/filter_object_greyscale_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
- evas_object_layer_set(o,1);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_GREYSCALE);
+ eo_do(o, evas_obj_layer_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_invert.c b/src/bin/filter_object_invert.c
index 506dd59..4f3c0a1 100644
--- a/src/bin/filter_object_invert.c
+++ b/src/bin/filter_object_invert.c
@@ -24,14 +24,14 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_INVERT);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_INVERT);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_invert_solid.c b/src/bin/filter_object_invert_solid.c
index 03e4eaa..a67a4ae 100644
--- a/src/bin/filter_object_invert_solid.c
+++ b/src/bin/filter_object_invert_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_INVERT);
- evas_object_layer_set(o,1);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_INVERT);
+ eo_do(o, evas_obj_layer_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_sepia.c b/src/bin/filter_object_sepia.c
index e9db58a..01a6239 100644
--- a/src/bin/filter_object_sepia.c
+++ b/src/bin/filter_object_sepia.c
@@ -24,14 +24,14 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_SEPIA);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_SEPIA);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -57,7 +57,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/filter_object_sepia_solid.c b/src/bin/filter_object_sepia_solid.c
index 3f092cf..3e7c20c 100644
--- a/src/bin/filter_object_sepia_solid.c
+++ b/src/bin/filter_object_sepia_solid.c
@@ -24,15 +24,15 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_filter_set(o, EVAS_FILTER_SEPIA);
- evas_object_layer_set(o,1);
- evas_object_show(o);
- src = o;
- o_images[i] = src;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
+ evas_object_filter_set(o, EVAS_FILTER_SEPIA);
+ eo_do(o, evas_obj_layer_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
+ src = o;
+ o_images[i] = src;
}
done = 0;
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,7 +58,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c
index 10d5b85..b5e683d 100644
--- a/src/bin/image_blend_border.c
+++ b/src/bin/image_blend_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("bar.png"), NULL);
- evas_object_image_border_set(o, 6, 6, 6, 6);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
+ evas_obj_image_border_set(6, 6, 6, 6),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_border_recolor.c b/src/bin/image_blend_border_recolor.c
index 3e11840..b05d263 100644
--- a/src/bin/image_blend_border_recolor.c
+++ b/src/bin/image_blend_border_recolor.c
@@ -23,12 +23,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_color_set(o, 64, 64, 64, 255);
- evas_object_image_border_set(o, 3, 3, 3, 3);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_color_set(64, 64, 64, 255),
+ evas_obj_image_border_set(3, 3, 3, 3),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_fade_pow2_unscaled.c b/src/bin/image_blend_fade_pow2_unscaled.c
index f31acaa..c5d649b 100644
--- a/src/bin/image_blend_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
-
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;
- evas_object_color_set(o, a, a, a, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(a, a, a, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_fade_unscaled.c b/src/bin/image_blend_fade_unscaled.c
index 658110f..1361c53 100644
--- a/src/bin/image_blend_fade_unscaled.c
+++ b/src/bin/image_blend_fade_unscaled.c
@@ -24,15 +24,14 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
-
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
a = rnd()&0xff;
- evas_object_color_set(o, a, a, a, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(a, a, a, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -41,7 +40,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -52,12 +51,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_nearest_same_scaled.c b/src/bin/image_blend_nearest_same_scaled.c
index 52ba6d7..f2bad8b 100644
--- a/src/bin/image_blend_nearest_same_scaled.c
+++ b/src/bin/image_blend_nearest_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 40 + ((i % 3) * (w0 / 2));
- h = 40 + ((i % 3) * (h0 / 2));
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 40 + ((i % 3) * (w0 / 2));
+ h = 40 + ((i % 3) * (h0 / 2));
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_nearest_scaled.c b/src/bin/image_blend_nearest_scaled.c
index 47a431e..951645e 100644
--- a/src/bin/image_blend_nearest_scaled.c
+++ b/src/bin/image_blend_nearest_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_nearest_solid_same_scaled.c b/src/bin/image_blend_nearest_solid_same_scaled.c
index e8979b4..21cb4be 100644
--- a/src/bin/image_blend_nearest_solid_same_scaled.c
+++ b/src/bin/image_blend_nearest_solid_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 40 + ((i % 3) * (w0 / 2));
- h = 40 + ((i % 3) * (h0 / 2));
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 40 + ((i % 3) * (w0 / 2));
+ h = 40 + ((i % 3) * (h0 / 2));
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_nearest_solid_scaled.c b/src/bin/image_blend_nearest_solid_scaled.c
index 1bd75df..d0af1a5 100644
--- a/src/bin/image_blend_nearest_solid_scaled.c
+++ b/src/bin/image_blend_nearest_solid_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude1.c b/src/bin/image_blend_occlude1.c
index 098ee57..cefe973 100644
--- a/src/bin/image_blend_occlude1.c
+++ b/src/bin/image_blend_occlude1.c
@@ -24,22 +24,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i < (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i < (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,7 +48,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i < (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i < (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude1_few.c b/src/bin/image_blend_occlude1_few.c
index c0ba2dc..830e181 100644
--- a/src/bin/image_blend_occlude1_few.c
+++ b/src/bin/image_blend_occlude1_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i < (OBNUM / 2))
- evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/logo.png", NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i < (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/logo.png", NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, PACKAGE_DATA_DIR"/data/image.png", NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i < (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i < (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude1_many.c b/src/bin/image_blend_occlude1_many.c
index 02a0f09..1953967 100644
--- a/src/bin/image_blend_occlude1_many.c
+++ b/src/bin/image_blend_occlude1_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i < (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i < (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i < (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i < (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude1_very_many.c b/src/bin/image_blend_occlude1_very_many.c
index 51b44f8..856d5a5 100644
--- a/src/bin/image_blend_occlude1_very_many.c
+++ b/src/bin/image_blend_occlude1_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i < (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i < (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i < (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i < (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c
index 4557bce..578f030 100644
--- a/src/bin/image_blend_occlude2.c
+++ b/src/bin/image_blend_occlude2.c
@@ -24,22 +24,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i & 0x1)
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i & 0x1)
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,7 +48,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i & 0x1)
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i & 0x1)
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude2_few.c b/src/bin/image_blend_occlude2_few.c
index 8aca4b1..d0eb4bd 100644
--- a/src/bin/image_blend_occlude2_few.c
+++ b/src/bin/image_blend_occlude2_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i & 0x1)
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i & 0x1)
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i & 0x1)
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i & 0x1)
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude2_many.c b/src/bin/image_blend_occlude2_many.c
index b0ab9ba..405f5ca 100644
--- a/src/bin/image_blend_occlude2_many.c
+++ b/src/bin/image_blend_occlude2_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i & 0x1)
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i & 0x1)
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i & 0x1)
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i & 0x1)
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude2_very_many.c b/src/bin/image_blend_occlude2_very_many.c
index 776ada8..d15445a 100644
--- a/src/bin/image_blend_occlude2_very_many.c
+++ b/src/bin/image_blend_occlude2_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i & 0x1)
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i & 0x1)
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i & 0x1)
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i & 0x1)
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c
index fa69b97..db7edc7 100644
--- a/src/bin/image_blend_occlude3.c
+++ b/src/bin/image_blend_occlude3.c
@@ -24,22 +24,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i > (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i > (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,7 +48,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -58,16 +58,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i > (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i > (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude3_few.c b/src/bin/image_blend_occlude3_few.c
index 92166f1..57888fc 100644
--- a/src/bin/image_blend_occlude3_few.c
+++ b/src/bin/image_blend_occlude3_few.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i > (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i > (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i > (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i > (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude3_many.c b/src/bin/image_blend_occlude3_many.c
index aecb5ee..3dd41a4 100644
--- a/src/bin/image_blend_occlude3_many.c
+++ b/src/bin/image_blend_occlude3_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i > (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i > (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i > (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i > (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_occlude3_very_many.c b/src/bin/image_blend_occlude3_very_many.c
index ea353ba..43d3642 100644
--- a/src/bin/image_blend_occlude3_very_many.c
+++ b/src/bin/image_blend_occlude3_very_many.c
@@ -27,22 +27,22 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- if (i > (OBNUM / 2))
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- else
- {
- Evas_Coord x, y;
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ if (i > (OBNUM / 2))
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL));
+ else
+ {
+ Evas_Coord x, y;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
- y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
- evas_object_move(o, x, y);
- }
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL));
+ x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
+ y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
+ eo_do(o, evas_obj_position_set(x, y));
+ }
+ eo_do(o, evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -51,7 +51,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,16 +61,16 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- if (i > (OBNUM / 2))
- {
- w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- }
+ if (i > (OBNUM / 2))
+ {
+ w = 120;
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ }
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_smooth_same_scaled.c b/src/bin/image_blend_smooth_same_scaled.c
index a1e6fc3..2301899 100644
--- a/src/bin/image_blend_smooth_same_scaled.c
+++ b/src/bin/image_blend_smooth_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_smooth_scale_set(o, 1);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_smooth_scale_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 40 + ((i % 3) * (w0 / 2));
- h = 40 + ((i % 3) * (h0 / 2));
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 40 + ((i % 3) * (w0 / 2));
+ h = 40 + ((i % 3) * (h0 / 2));
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_smooth_scaled.c b/src/bin/image_blend_smooth_scaled.c
index b2086f0..afa2b5d 100644
--- a/src/bin/image_blend_smooth_scaled.c
+++ b/src/bin/image_blend_smooth_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_smooth_scale_set(o, 1);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_smooth_scale_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_smooth_solid_same_scaled.c b/src/bin/image_blend_smooth_solid_same_scaled.c
index 41366a3..fe0763c 100644
--- a/src/bin/image_blend_smooth_solid_same_scaled.c
+++ b/src/bin/image_blend_smooth_solid_same_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_smooth_scale_set(o, 1);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_smooth_scale_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 40 + ((i % 3) * (w0 / 2));
- h = 40 + ((i % 3) * (h0 / 2));
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 40 + ((i % 3) * (w0 / 2));
+ h = 40 + ((i % 3) * (h0 / 2));
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_smooth_solid_scaled.c b/src/bin/image_blend_smooth_solid_scaled.c
index e4028bd..db13620 100644
--- a/src/bin/image_blend_smooth_solid_scaled.c
+++ b/src/bin/image_blend_smooth_solid_scaled.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_smooth_scale_set(o, 1);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_smooth_scale_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
index 2e1b0bb..7e05605 100644
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("frame.png"), NULL);
- evas_object_image_border_set(o, 8, 8, 8, 8);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("frame.png"), NULL),
+ evas_obj_image_border_set(8, 8, 8, 8),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -36,7 +36,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -47,16 +47,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_solid_fade_pow2_unscaled.c b/src/bin/image_blend_solid_fade_pow2_unscaled.c
index 1af71db..01e6e59 100644
--- a/src/bin/image_blend_solid_fade_pow2_unscaled.c
+++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c
@@ -24,16 +24,16 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
-
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;
- evas_object_color_set(o, a, a, a, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(a, a, a, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -53,12 +53,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_solid_fade_unscaled.c b/src/bin/image_blend_solid_fade_unscaled.c
index 6a6cb9f..769d59c 100644
--- a/src/bin/image_blend_solid_fade_unscaled.c
+++ b/src/bin/image_blend_solid_fade_unscaled.c
@@ -24,15 +24,15 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
-
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160));
a = rnd()&0xff;
- evas_object_color_set(o, a, a, a, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(a, a, a, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -52,12 +52,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_solid_middle_border.c b/src/bin/image_blend_solid_middle_border.c
index 5a7d6f9..86c4a5f 100644
--- a/src/bin/image_blend_solid_middle_border.c
+++ b/src/bin/image_blend_solid_middle_border.c
@@ -23,12 +23,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("bar.png"), NULL);
- evas_object_image_border_set(o, 6, 6, 6, 6);
- evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("bar.png"), NULL),
+ evas_obj_image_border_set(6, 6, 6, 6),
+ evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -48,16 +48,16 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w0 = 80;
- h0 = 80;
- w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
- h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ h0 = 80;
+ w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+ h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_solid_middle_unscaled.c b/src/bin/image_blend_solid_middle_unscaled.c
index b2a30ca..82860e8 100644
--- a/src/bin/image_blend_solid_middle_unscaled.c
+++ b/src/bin/image_blend_solid_middle_unscaled.c
@@ -23,14 +23,14 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_border_set(o, 43, 48, 48, 83);
- evas_object_image_border_center_fill_set(o, EVAS_BORDER_FILL_SOLID);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_border_set(43, 48, 48, 83),
+ evas_obj_image_border_center_fill_set(EVAS_BORDER_FILL_SOLID),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -50,12 +50,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_solid_unscaled.c b/src/bin/image_blend_solid_unscaled.c
index 136323e..e53b20f 100644
--- a/src/bin/image_blend_solid_unscaled.c
+++ b/src/bin/image_blend_solid_unscaled.c
@@ -23,12 +23,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c
index 02feb60..65f3f6b 100644
--- a/src/bin/image_blend_unscaled.c
+++ b/src/bin/image_blend_unscaled.c
@@ -23,12 +23,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -37,7 +37,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -48,12 +48,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
- x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
- y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
+ x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+ y = (win_h / 2) - (h / 2);
+ y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c
index 3a824a8..b5694c3 100644
--- a/src/bin/image_crossfade.c
+++ b/src/bin/image_crossfade.c
@@ -22,19 +22,19 @@ static void _setup(void)
{
Evas_Object *o;
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[0] = o;
- evas_object_image_file_set(o, build_path("im1.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("im1.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_visibility_set(EINA_TRUE));
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[1] = o;
- evas_object_image_file_set(o, build_path("im2.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("im2.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_visibility_set(EINA_TRUE));
done = 0;
}
@@ -43,7 +43,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 2; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 2; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -53,7 +53,7 @@ static void _loop(double t, int f)
a = f & 0x1f;
a = ((a << 3) | (a >> 2)) & 0xff;
- evas_object_color_set(o_images[1], a, a, a, a);
+ eo_do(o_images[1], evas_obj_color_set(a, a, a, a));
FPS_STD(NAME);
}
diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c
index 90f6779..6bdbc2f 100644
--- a/src/bin/image_data_argb.c
+++ b/src/bin/image_data_argb.c
@@ -24,15 +24,15 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
- evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
- evas_object_image_size_set(o, 640, 480);
- evas_object_image_alpha_set(o, 0);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+ evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
+ evas_obj_image_size_set(640, 480),
+ evas_obj_image_alpha_set(0),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -51,29 +51,30 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < 1; i++)
{
- unsigned int *data, *p;
+ unsigned int *data, *p;
w = 640;
- h = 480;
- x = (win_w / 2) - (w / 2);
- y = (win_h / 2) - (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
- data = evas_object_image_data_get(o_images[i], 1);
- st = evas_object_image_stride_get(o_images[i]) >> 2;
- p = data;
- for (y = 0; y < h; y++)
- {
- for (x = 0; x < w; x++)
- {
- *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
- p++;
- }
+ h = 480;
+ x = (win_w / 2) - (w / 2);
+ y = (win_h / 2) - (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h),
+ evas_obj_image_data_get(1, (void **) &data),
+ evas_obj_image_stride_get(&st));
+ st = st >> 2;
+ p = data;
+ for (y = 0; y < h; y++)
+ {
+ for (x = 0; x < w; x++)
+ {
+ *p = ((((x * y) + f) << 8) ^ (x - y - f)) | 0xff000000;
+ p++;
+ }
p += (st - w);
- }
- evas_object_image_data_set(o_images[i], data);
- evas_object_image_data_update_add(o_images[i], 0, 0, w, h);
+ }
+ eo_do(o_images[i], evas_obj_image_data_set(data),
+ evas_obj_image_data_update_add( 0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c
index 1498fb7..1dae2f1 100644
--- a/src/bin/image_data_argb_alpha.c
+++ b/src/bin/image_data_argb_alpha.c
@@ -24,15 +24,15 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
- evas_object_image_colorspace_set(o, EVAS_COLORSPACE_ARGB8888);
- evas_object_image_size_set(o, 640, 480);
- evas_object_image_alpha_set(o, 1);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+ evas_obj_image_colorspace_set(EVAS_COLORSPACE_ARGB8888),
+ evas_obj_image_size_set(640, 480),
+ evas_obj_image_alpha_set(1),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -41,7 +41,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -51,40 +51,41 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < 1; i++)
{
- unsigned int *data, *p;
- int a, r, g, b;
+ unsigned int *data, *p;
+ int a, r, g, b;
w = 640;
- h = 480;
- x = (win_w / 2) - (w / 2);
- y = (win_h / 2) - (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
- data = evas_object_image_data_get(o_images[i], 1);
- st = evas_object_image_stride_get(o_images[i]) >> 2;
- p = data;
- for (y = 0; y < h; y++)
- {
- for (x = 0; x < w; x++)
- {
- r = (x * y / 7) + f;
- g = (x / 2);
- b = (y / 2);
- a = (x + y);
- r &= 0xff;
- g &= 0xff;
- b &= 0xff;
- a &= 0xff;
- r = (a * r) / 255;
- g = (a * g) / 255;
- b = (a * b) / 255;
- *p = (a << 24) | (r << 16) | (g << 8) | b;
- p++;
- }
+ h = 480;
+ x = (win_w / 2) - (w / 2);
+ y = (win_h / 2) - (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h),
+ evas_obj_image_data_get(1, (void **) &data),
+ evas_obj_image_stride_get(&st));
+ st = st >> 2;
+ p = data;
+ for (y = 0; y < h; y++)
+ {
+ for (x = 0; x < w; x++)
+ {
+ r = (x * y / 7) + f;
+ g = (x / 2);
+ b = (y / 2);
+ a = (x + y);
+ r &= 0xff;
+ g &= 0xff;
+ b &= 0xff;
+ a &= 0xff;
+ r = (a * r) / 255;
+ g = (a * g) / 255;
+ b = (a * b) / 255;
+ *p = (a << 24) | (r << 16) | (g << 8) | b;
+ p++;
+ }
p += (st - w);
- }
- evas_object_image_data_set(o_images[i], data);
- evas_object_image_data_update_add(o_images[i], 0, 0, w, h);
+ }
+ eo_do(o_images[i], evas_obj_image_data_set(data),
+ evas_obj_image_data_update_add( 0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c
index d3be38f..3ecbc8b 100644
--- a/src/bin/image_data_ycbcr601pl.c
+++ b/src/bin/image_data_ycbcr601pl.c
@@ -28,44 +28,44 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
- evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
- evas_object_image_size_set(o, 640, 480);
- evas_object_image_alpha_set(o, 0);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_show(o);
- yp = malloc(640 * 480);
- up = malloc(320 * 240);
- vp = malloc(320 * 240);
- f = fopen(build_path("tp.yuv"), "rb");
- if (f)
- {
- r = fread(yp, 640 * 480, 1, f);
- r = fread(up, 320 * 240, 1, f);
- r = fread(vp, 320 * 240, 1, f);
- fclose(f);
- }
- data = evas_object_image_data_get(o_images[i], 1);
- lp = data;
- for (y = 0; y < 480; y++)
- {
- *lp = yp + (y * 640);
- lp++;
- }
- for (y = 0; y < 240; y++)
- {
- *lp = up + (y * 320);
- lp++;
- }
- for (y = 0; y < 240; y++)
- {
- *lp = vp + (y * 320);
- lp++;
- }
- evas_object_image_data_set(o_images[i], data);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+ evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+ evas_obj_image_size_set(640, 480),
+ evas_obj_image_alpha_set(0),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_visibility_set(EINA_TRUE));
+ yp = malloc(640 * 480);
+ up = malloc(320 * 240);
+ vp = malloc(320 * 240);
+ f = fopen(build_path("tp.yuv"), "rb");
+ if (f)
+ {
+ r = fread(yp, 640 * 480, 1, f);
+ r = fread(up, 320 * 240, 1, f);
+ r = fread(vp, 320 * 240, 1, f);
+ fclose(f);
+ }
+ data = evas_object_image_data_get(o_images[i], 1);
+ lp = data;
+ for (y = 0; y < 480; y++)
+ {
+ *lp = yp + (y * 640);
+ lp++;
+ }
+ for (y = 0; y < 240; y++)
+ {
+ *lp = up + (y * 320);
+ lp++;
+ }
+ for (y = 0; y < 240; y++)
+ {
+ *lp = vp + (y * 320);
+ lp++;
+ }
+ eo_do(o_images[i], evas_obj_image_data_set(data));
}
done = 0;
}
@@ -74,7 +74,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
free(yp);
free(up);
free(vp);
@@ -88,13 +88,13 @@ static void _loop(double t, int f)
for (i = 0; i < 1; i++)
{
w = 640;
- h = 480;
- x = (win_w / 2) - (w / 2);
- y = (win_h / 2) - (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
- evas_object_image_data_update_add(o_images[i], 0, 0, 640, 480);
+ h = 480;
+ x = (win_w / 2) - (w / 2);
+ y = (win_h / 2) - (h / 2);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h),
+ evas_obj_image_data_update_add( 0, 0, 640, 480));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
index 3b827fa..14cc7a9 100644
--- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
@@ -28,16 +28,16 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
- evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
- evas_object_image_size_set(o, 640, 480);
- evas_object_image_alpha_set(o, 0);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+ evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+ evas_obj_image_size_set(640, 480),
+ evas_obj_image_alpha_set(0),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
yp = malloc(640 * 480);
up = malloc(320 * 240);
vp = malloc(320 * 240);
@@ -66,7 +66,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
- evas_object_image_data_set(o_images[i], data);
+ eo_do(o_images[i], evas_obj_image_data_set(data));
}
done = 0;
}
@@ -75,7 +75,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
free(yp);
free(up);
free(vp);
@@ -100,8 +100,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
index 290f716..17558dd 100644
--- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
+++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c
@@ -28,15 +28,15 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
- evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
- evas_object_image_size_set(o, 640, 480);
- evas_object_image_alpha_set(o, 0);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+ evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+ evas_obj_image_size_set(640, 480),
+ evas_obj_image_alpha_set(0),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_visibility_set(EINA_TRUE));
yp = malloc(640 * 480);
up = malloc(320 * 240);
vp = malloc(320 * 240);
@@ -65,7 +65,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
- evas_object_image_data_set(o_images[i], data);
+ eo_do(o_images[i], evas_obj_image_data_set(data));
}
done = 0;
}
@@ -74,7 +74,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
free(yp);
free(up);
free(vp);
@@ -98,8 +98,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c
index e46e94b..88deeaf 100644
--- a/src/bin/image_data_ycbcr601pl_wide_stride.c
+++ b/src/bin/image_data_ycbcr601pl_wide_stride.c
@@ -28,48 +28,48 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_content_hint_set(o, EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
- evas_object_image_colorspace_set(o, EVAS_COLORSPACE_YCBCR422P601_PL);
- evas_object_image_size_set(o, 320, 480);
- evas_object_image_alpha_set(o, 0);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_show(o);
- yp = malloc(640 * 480);
- up = malloc(320 * 240);
- vp = malloc(320 * 240);
- f = fopen(build_path("tp.yuv"), "rb");
- if (f)
- {
- r = fread(yp, 640 * 480, 1, f);
- r = fread(up, 320 * 240, 1, f);
- r = fread(vp, 320 * 240, 1, f);
- fclose(f);
- }
- data = evas_object_image_data_get(o_images[i], 1);
- if (data)
- {
- lp = data;
- for (y = 0; y < 480; y++)
- {
- *lp = yp + (y * 640);
- lp++;
- }
- for (y = 0; y < 240; y++)
- {
- *lp = up + (y * 320);
- lp++;
- }
- for (y = 0; y < 240; y++)
- {
- *lp = vp + (y * 320);
- lp++;
- }
- evas_object_image_data_set(o_images[i], data);
- evas_object_image_data_update_add(o_images[i], 0, 0, 320, 480);
- }
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
+ evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL),
+ evas_obj_image_size_set(320, 480),
+ evas_obj_image_alpha_set(0),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_visibility_set(EINA_TRUE));
+ yp = malloc(640 * 480);
+ up = malloc(320 * 240);
+ vp = malloc(320 * 240);
+ f = fopen(build_path("tp.yuv"), "rb");
+ if (f)
+ {
+ r = fread(yp, 640 * 480, 1, f);
+ r = fread(up, 320 * 240, 1, f);
+ r = fread(vp, 320 * 240, 1, f);
+ fclose(f);
+ }
+ data = evas_object_image_data_get(o_images[i], 1);
+ if (data)
+ {
+ lp = data;
+ for (y = 0; y < 480; y++)
+ {
+ *lp = yp + (y * 640);
+ lp++;
+ }
+ for (y = 0; y < 240; y++)
+ {
+ *lp = up + (y * 320);
+ lp++;
+ }
+ for (y = 0; y < 240; y++)
+ {
+ *lp = vp + (y * 320);
+ lp++;
+ }
+ eo_do(o_images[i], evas_obj_image_data_set(data),
+ evas_obj_image_data_update_add( 0, 0, 320, 480));
+ }
}
done = 0;
}
@@ -78,7 +78,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
free(yp);
free(up);
free(vp);
@@ -97,9 +97,9 @@ static void _loop(double t, int f)
h = 480;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_images[i], evas_obj_size_set(w, h));
+ eo_do(o_images[i], evas_obj_image_fill_set(0, 0, w, h));
w = 320 - 16 + f;
if (w < 1) w = 1;
@@ -107,7 +107,7 @@ static void _loop(double t, int f)
w &= ~0x1;
- evas_object_image_size_set(o_images[i], w, 480);
+ eo_do(o_images[i], evas_obj_image_size_set(w, 480));
data = evas_object_image_data_get(o_images[i], 1);
if (data)
{
@@ -127,8 +127,8 @@ static void _loop(double t, int f)
*lp = vp + (y * 320);
lp++;
}
- evas_object_image_data_set(o_images[i], data);
- evas_object_image_data_update_add(o_images[i], 0, 0, w, 480);
+ eo_do(o_images[i], evas_obj_image_data_set(data));
+ eo_do(o_images[i], evas_obj_image_data_update_add( 0, 0, w, 480));
}
}
FPS_STD(NAME);
diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c
index d3b65b8..b4ad6b6 100644
--- a/src/bin/image_map_3d_1.c
+++ b/src/bin/image_map_3d_1.c
@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(1, 1, w, -h, d, 256, 0);
POINT(1, 2, w, h, d, 256, 256);
POINT(1, 3, w, h, -d, 0, 256);
-
+
POINT(2, 0, w, -h, d, 0, 0);
POINT(2, 1, -w, -h, d, 256, 0);
POINT(2, 2, -w, h, d, 256, 256);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(3, 1, -w, -h, -d, 256, 0);
POINT(3, 2, -w, h, -d, 256, 256);
POINT(3, 3, -w, h, d, 0, 256);
-
+
POINT(4, 0, -w, -h, d, 0, 0);
POINT(4, 1, w, -h, d, 256, 0);
POINT(4, 2, w, -h, -d, 256, 256);
POINT(4, 3, -w, -h, -d, 0, 256);
-
+
POINT(5, 0, -w, h, -d, 0, 0);
POINT(5, 1, w, h, -d, 256, 0);
POINT(5, 2, w, h, d, 256, 256);
POINT(5, 3, -w, h, d, 0, 256);
-
+
return c;
}
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
static Evas_Map *m = NULL;
int i, j, order[6], sorted;
Evas_Coord mz[6];
-
+
if (!m) m = evas_map_new(4);
evas_map_smooth_set(m, 0);
for (i = 0; i < 6; i++)
{
Evas_Coord tz[4];
-
+
for (j = 0; j < 4; j++)
{
evas_map_point_coord_set(m, j,
- c->side[i].pt[j].x + x,
- c->side[i].pt[j].y + y,
+ c->side[i].pt[j].x + x,
+ c->side[i].pt[j].y + y,
c->side[i].pt[j].z + z);
evas_map_point_image_uv_set(m, j,
c->side[i].pt[j].u,
@@ -130,13 +130,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
if (evas_map_util_clockwise_get(m))
{
- evas_object_map_enable_set(c->side[i].o, 1);
- evas_object_map_set(c->side[i].o, m);
- evas_object_show(c->side[i].o);
+ eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m),
+ evas_obj_visibility_set(EINA_TRUE));
}
else
- evas_object_hide(c->side[i].o);
-
+ eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+
order[i] = i;
for (j = 0; j < 4; j++)
evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -159,17 +159,17 @@ _cube_pos(Cube *c,
}
while (!sorted);
- evas_object_raise(c->side[order[0]].o);
+ eo_do(c->side[order[0]].o, evas_obj_raise());
for (i = 1; i < 6; i++)
- evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+ eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
}
static void
_cube_free(Cube *c)
{
int i;
-
- for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+ for (i = 0; i < 6; i++) eo_del(c->side[i].o);
free(c);
}
diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c
index 9d10462..dde2c0d 100644
--- a/src/bin/image_map_3d_2.c
+++ b/src/bin/image_map_3d_2.c
@@ -54,13 +54,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -71,7 +71,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(1, 1, w, -h, d, 256, 0);
POINT(1, 2, w, h, d, 256, 256);
POINT(1, 3, w, h, -d, 0, 256);
-
+
POINT(2, 0, w, -h, d, 0, 0);
POINT(2, 1, -w, -h, d, 256, 0);
POINT(2, 2, -w, h, d, 256, 256);
@@ -81,17 +81,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(3, 1, -w, -h, -d, 256, 0);
POINT(3, 2, -w, h, -d, 256, 256);
POINT(3, 3, -w, h, d, 0, 256);
-
+
POINT(4, 0, -w, -h, d, 0, 0);
POINT(4, 1, w, -h, d, 256, 0);
POINT(4, 2, w, -h, -d, 256, 256);
POINT(4, 3, -w, -h, -d, 0, 256);
-
+
POINT(5, 0, -w, h, -d, 0, 0);
POINT(5, 1, w, h, -d, 256, 0);
POINT(5, 2, w, h, d, 256, 256);
POINT(5, 3, -w, h, d, 0, 256);
-
+
return c;
}
@@ -103,18 +103,18 @@ _cube_pos(Cube *c,
static Evas_Map *m = NULL;
int i, j, order[6], sorted;
Evas_Coord mz[6];
-
+
if (!m) m = evas_map_new(4);
for (i = 0; i < 6; i++)
{
Evas_Coord tz[4];
-
+
for (j = 0; j < 4; j++)
{
evas_map_point_coord_set(m, j,
- c->side[i].pt[j].x + x,
- c->side[i].pt[j].y + y,
+ c->side[i].pt[j].x + x,
+ c->side[i].pt[j].y + y,
c->side[i].pt[j].z + z);
evas_map_point_image_uv_set(m, j,
c->side[i].pt[j].u,
@@ -128,13 +128,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
if (evas_map_util_clockwise_get(m))
{
- evas_object_map_enable_set(c->side[i].o, 1);
- evas_object_map_set(c->side[i].o, m);
- evas_object_show(c->side[i].o);
+ eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m),
+ evas_obj_visibility_set(EINA_TRUE));
}
else
- evas_object_hide(c->side[i].o);
-
+ eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+
order[i] = i;
for (j = 0; j < 4; j++)
evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -157,17 +157,17 @@ _cube_pos(Cube *c,
}
while (!sorted);
- evas_object_raise(c->side[order[0]].o);
+ eo_do(c->side[order[0]].o, evas_obj_raise());
for (i = 1; i < 6; i++)
- evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+ eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
}
static void
_cube_free(Cube *c)
{
int i;
-
- for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+ for (i = 0; i < 6; i++) eo_del(c->side[i].o);
free(c);
}
@@ -196,20 +196,20 @@ static void _cleanup(void)
/* loop - do things */
static void _loop(double t, int f)
{
- _cube_pos(cubes[0],
+ _cube_pos(cubes[0],
(win_w / 2) - 640, (win_h / 2) - 256, 512,
f / 2.0, f, f / 3.0);
- _cube_pos(cubes[1],
+ _cube_pos(cubes[1],
(win_w / 2) + 512, (win_h / 2) - 128, 384,
f / 3.0, f / 2.0, f / 4.0);
- _cube_pos(cubes[2],
- (win_w / 2) - 384, (win_h / 2) + 128, 256,
+ _cube_pos(cubes[2],
+ (win_w / 2) - 384, (win_h / 2) + 128, 256,
f / 2.0, f / 3.0, f);
- _cube_pos(cubes[3],
- (win_w / 2) + 256, (win_h / 2) + 64, 128,
+ _cube_pos(cubes[3],
+ (win_w / 2) + 256, (win_h / 2) + 64, 128,
f, f / 5.0, f / 2.0);
- _cube_pos(cubes[4],
- (win_w / 2), (win_h / 2), 0,
+ _cube_pos(cubes[4],
+ (win_w / 2), (win_h / 2), 0,
f / 4.0, f / 3.0, f / 5.0);
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c
index 09ce38d..8bbbd37 100644
--- a/src/bin/image_map_3d_3.c
+++ b/src/bin/image_map_3d_3.c
@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(1, 1, w, -h, d, 256, 0);
POINT(1, 2, w, h, d, 256, 256);
POINT(1, 3, w, h, -d, 0, 256);
-
+
POINT(2, 0, w, -h, d, 0, 0);
POINT(2, 1, -w, -h, d, 256, 0);
POINT(2, 2, -w, h, d, 256, 256);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(3, 1, -w, -h, -d, 256, 0);
POINT(3, 2, -w, h, -d, 256, 256);
POINT(3, 3, -w, h, d, 0, 256);
-
+
POINT(4, 0, -w, -h, d, 0, 0);
POINT(4, 1, w, -h, d, 256, 0);
POINT(4, 2, w, -h, -d, 256, 256);
POINT(4, 3, -w, -h, -d, 0, 256);
-
+
POINT(5, 0, -w, h, -d, 0, 0);
POINT(5, 1, w, h, -d, 256, 0);
POINT(5, 2, w, h, d, 256, 256);
POINT(5, 3, -w, h, d, 0, 256);
-
+
return c;
}
@@ -104,23 +104,23 @@ _cube_pos(Cube *c,
static Evas_Map *m = NULL;
int i, j, order[6], sorted;
Evas_Coord mz[6];
-
+
if (!m) m = evas_map_new(4);
evas_map_smooth_set(m, 0);
for (i = 0; i < 6; i++)
{
Evas_Coord tz[4];
-
+
for (j = 0; j < 4; j++)
{
evas_map_point_coord_set(m, j,
- c->side[i].pt[j].x + x,
- c->side[i].pt[j].y + y,
+ c->side[i].pt[j].x + x,
+ c->side[i].pt[j].y + y,
c->side[i].pt[j].z + z);
evas_map_point_image_uv_set(m, j,
- c->side[i].pt[j].u,
- c->side[i].pt[j].v);
+ c->side[i].pt[j].u,
+ c->side[i].pt[j].v);
evas_map_point_color_set(m, j, 255, 255, 255, 128);
}
evas_map_util_3d_rotate(m, dx, dy, dz, x, y, z);
@@ -128,9 +128,9 @@ _cube_pos(Cube *c,
255, 255, 255,
20, 20, 20);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
- evas_object_map_enable_set(c->side[i].o, 1);
- evas_object_map_set(c->side[i].o, m);
-
+ eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
+
order[i] = i;
for (j = 0; j < 4; j++)
evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -153,17 +153,17 @@ _cube_pos(Cube *c,
}
while (!sorted);
- evas_object_raise(c->side[order[0]].o);
+ eo_do(c->side[order[0]].o, evas_obj_raise());
for (i = 1; i < 6; i++)
- evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+ eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
}
static void
_cube_free(Cube *c)
{
int i;
-
- for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+ for (i = 0; i < 6; i++) eo_del(c->side[i].o);
free(c);
}
@@ -192,20 +192,20 @@ static void _cleanup(void)
/* loop - do things */
static void _loop(double t, int f)
{
- _cube_pos(cubes[0],
+ _cube_pos(cubes[0],
(win_w / 2) - 640, (win_h / 2) - 256, 512,
f / 2.0, f, f / 3.0);
- _cube_pos(cubes[1],
+ _cube_pos(cubes[1],
(win_w / 2) + 512, (win_h / 2) - 128, 384,
f / 3.0, f / 2.0, f / 4.0);
- _cube_pos(cubes[2],
- (win_w / 2) - 384, (win_h / 2) + 128, 256,
+ _cube_pos(cubes[2],
+ (win_w / 2) - 384, (win_h / 2) + 128, 256,
f / 2.0, f / 3.0, f);
- _cube_pos(cubes[3],
- (win_w / 2) + 256, (win_h / 2) + 64, 128,
+ _cube_pos(cubes[3],
+ (win_w / 2) + 256, (win_h / 2) + 64, 128,
f, f / 5.0, f / 2.0);
- _cube_pos(cubes[4],
- (win_w / 2), (win_h / 2), 0,
+ _cube_pos(cubes[4],
+ (win_w / 2), (win_h / 2), 0,
f / 4.0, f / 3.0, f / 5.0);
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c
index 9f54835..7a4d28b 100644
--- a/src/bin/image_map_3d_4.c
+++ b/src/bin/image_map_3d_4.c
@@ -54,13 +54,13 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 256, 0);
@@ -71,7 +71,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(1, 1, w, -h, d, 256, 0);
POINT(1, 2, w, h, d, 256, 256);
POINT(1, 3, w, h, -d, 0, 256);
-
+
POINT(2, 0, w, -h, d, 0, 0);
POINT(2, 1, -w, -h, d, 256, 0);
POINT(2, 2, -w, h, d, 256, 256);
@@ -81,17 +81,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(3, 1, -w, -h, -d, 256, 0);
POINT(3, 2, -w, h, -d, 256, 256);
POINT(3, 3, -w, h, d, 0, 256);
-
+
POINT(4, 0, -w, -h, d, 0, 0);
POINT(4, 1, w, -h, d, 256, 0);
POINT(4, 2, w, -h, -d, 256, 256);
POINT(4, 3, -w, -h, -d, 0, 256);
-
+
POINT(5, 0, -w, h, -d, 0, 0);
POINT(5, 1, w, h, -d, 256, 0);
POINT(5, 2, w, h, d, 256, 256);
POINT(5, 3, -w, h, d, 0, 256);
-
+
return c;
}
@@ -103,22 +103,22 @@ _cube_pos(Cube *c,
static Evas_Map *m = NULL;
int i, j, order[6], sorted;
Evas_Coord mz[6];
-
+
if (!m) m = evas_map_new(4);
for (i = 0; i < 6; i++)
{
Evas_Coord tz[4];
-
+
for (j = 0; j < 4; j++)
{
evas_map_point_coord_set(m, j,
- c->side[i].pt[j].x + x,
- c->side[i].pt[j].y + y,
+ c->side[i].pt[j].x + x,
+ c->side[i].pt[j].y + y,
c->side[i].pt[j].z + z);
evas_map_point_image_uv_set(m, j,
- c->side[i].pt[j].u,
- c->side[i].pt[j].v);
+ c->side[i].pt[j].u,
+ c->side[i].pt[j].v);
evas_map_point_color_set(m, j, 255, 255, 255, 128);
}
evas_map_util_3d_rotate(m, dx, dy, dz, x, y, z);
@@ -126,9 +126,9 @@ _cube_pos(Cube *c,
255, 255, 255,
20, 20, 20);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), 0, 512);
- evas_object_map_enable_set(c->side[i].o, 1);
- evas_object_map_set(c->side[i].o, m);
-
+ eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
+
order[i] = i;
for (j = 0; j < 4; j++)
evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -151,17 +151,17 @@ _cube_pos(Cube *c,
}
while (!sorted);
- evas_object_raise(c->side[order[0]].o);
+ eo_do(c->side[order[0]].o, evas_obj_raise());
for (i = 1; i < 6; i++)
- evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+ eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
}
static void
_cube_free(Cube *c)
{
int i;
-
- for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+ for (i = 0; i < 6; i++) eo_del(c->side[i].o);
free(c);
}
@@ -190,20 +190,20 @@ static void _cleanup(void)
/* loop - do things */
static void _loop(double t, int f)
{
- _cube_pos(cubes[0],
+ _cube_pos(cubes[0],
(win_w / 2) - 640, (win_h / 2) - 256, 512,
f / 2.0, f, f / 3.0);
- _cube_pos(cubes[1],
+ _cube_pos(cubes[1],
(win_w / 2) + 512, (win_h / 2) - 128, 384,
f / 3.0, f / 2.0, f / 4.0);
- _cube_pos(cubes[2],
- (win_w / 2) - 384, (win_h / 2) + 128, 256,
+ _cube_pos(cubes[2],
+ (win_w / 2) - 384, (win_h / 2) + 128, 256,
f / 2.0, f / 3.0, f);
- _cube_pos(cubes[3],
- (win_w / 2) + 256, (win_h / 2) + 64, 128,
+ _cube_pos(cubes[3],
+ (win_w / 2) + 256, (win_h / 2) + 64, 128,
f, f / 5.0, f / 2.0);
- _cube_pos(cubes[4],
- (win_w / 2), (win_h / 2), 0,
+ _cube_pos(cubes[4],
+ (win_w / 2), (win_h / 2), 0,
f / 4.0, f / 3.0, f / 5.0);
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c
index 9d5c390..c3aa402 100644
--- a/src/bin/image_map_3d_5.c
+++ b/src/bin/image_map_3d_5.c
@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 720, 0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(1, 1, w, -h, d, 720, 0);
POINT(1, 2, w, h, d, 720, 420);
POINT(1, 3, w, h, -d, 0, 420);
-
+
POINT(2, 0, w, -h, d, 0, 0);
POINT(2, 1, -w, -h, d, 720, 0);
POINT(2, 2, -w, h, d, 720, 420);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(3, 1, -w, -h, -d, 720, 0);
POINT(3, 2, -w, h, -d, 720, 420);
POINT(3, 3, -w, h, d, 0, 420);
-
+
POINT(4, 0, -w, -h, d, 0, 0);
POINT(4, 1, w, -h, d, 720, 0);
POINT(4, 2, w, -h, -d, 720, 420);
POINT(4, 3, -w, -h, -d, 0, 420);
-
+
POINT(5, 0, -w, h, -d, 0, 0);
POINT(5, 1, w, h, -d, 720, 0);
POINT(5, 2, w, h, d, 720, 420);
POINT(5, 3, -w, h, d, 0, 420);
-
+
return c;
}
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
static Evas_Map *m = NULL;
int i, j, order[6], sorted;
Evas_Coord mz[6];
-
+
if (!m) m = evas_map_new(4);
evas_map_smooth_set(m, 0);
for (i = 0; i < 6; i++)
{
Evas_Coord tz[4];
-
+
for (j = 0; j < 4; j++)
{
evas_map_point_coord_set(m, j,
- c->side[i].pt[j].x + x,
- c->side[i].pt[j].y + y,
+ c->side[i].pt[j].x + x,
+ c->side[i].pt[j].y + y,
c->side[i].pt[j].z + z);
evas_map_point_image_uv_set(m, j,
c->side[i].pt[j].u,
@@ -130,13 +130,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
if (evas_map_util_clockwise_get(m))
{
- evas_object_map_enable_set(c->side[i].o, 1);
- evas_object_map_set(c->side[i].o, m);
- evas_object_show(c->side[i].o);
+ eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m),
+ evas_obj_visibility_set(EINA_TRUE));
}
else
- evas_object_hide(c->side[i].o);
-
+ eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+
order[i] = i;
for (j = 0; j < 4; j++)
evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -159,17 +159,17 @@ _cube_pos(Cube *c,
}
while (!sorted);
- evas_object_raise(c->side[order[0]].o);
+ eo_do(c->side[order[0]].o, evas_obj_raise());
for (i = 1; i < 6; i++)
- evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+ eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
}
static void
_cube_free(Cube *c)
{
int i;
-
- for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+ for (i = 0; i < 6; i++) eo_del(c->side[i].o);
free(c);
}
@@ -190,8 +190,8 @@ static void _cleanup(void)
/* loop - do things */
static void _loop(double t, int f)
{
- _cube_pos(cubes[0],
- (win_w / 2), (win_h / 2), 0,
+ _cube_pos(cubes[0],
+ (win_w / 2), (win_h / 2), 0,
0, f, 0);
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c
index fd0c419..b67ae86 100644
--- a/src/bin/image_map_3d_6.c
+++ b/src/bin/image_map_3d_6.c
@@ -54,14 +54,14 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
POINT(0, 0, -w, -h, -d, 0, 0);
POINT(0, 1, w, -h, -d, 720, 0);
@@ -72,7 +72,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(1, 1, w, -h, d, 720, 0);
POINT(1, 2, w, h, d, 720, 420);
POINT(1, 3, w, h, -d, 0, 420);
-
+
POINT(2, 0, w, -h, d, 0, 0);
POINT(2, 1, -w, -h, d, 720, 0);
POINT(2, 2, -w, h, d, 720, 420);
@@ -82,17 +82,17 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
POINT(3, 1, -w, -h, -d, 720, 0);
POINT(3, 2, -w, h, -d, 720, 420);
POINT(3, 3, -w, h, d, 0, 420);
-
+
POINT(4, 0, -w, -h, d, 0, 0);
POINT(4, 1, w, -h, d, 720, 0);
POINT(4, 2, w, -h, -d, 720, 420);
POINT(4, 3, -w, -h, -d, 0, 420);
-
+
POINT(5, 0, -w, h, -d, 0, 0);
POINT(5, 1, w, h, -d, 720, 0);
POINT(5, 2, w, h, d, 720, 420);
POINT(5, 3, -w, h, d, 0, 420);
-
+
return c;
}
@@ -104,19 +104,19 @@ _cube_pos(Cube *c,
static Evas_Map *m = NULL;
int i, j, order[6], sorted;
Evas_Coord mz[6];
-
+
if (!m) m = evas_map_new(4);
evas_map_smooth_set(m, 0);
for (i = 0; i < 6; i++)
{
Evas_Coord tz[4];
-
+
for (j = 0; j < 4; j++)
{
evas_map_point_coord_set(m, j,
- c->side[i].pt[j].x + x,
- c->side[i].pt[j].y + y,
+ c->side[i].pt[j].x + x,
+ c->side[i].pt[j].y + y,
c->side[i].pt[j].z + z);
evas_map_point_image_uv_set(m, j,
c->side[i].pt[j].u,
@@ -127,13 +127,13 @@ _cube_pos(Cube *c,
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -360, 720);
if (evas_map_util_clockwise_get(m))
{
- evas_object_map_enable_set(c->side[i].o, 1);
- evas_object_map_set(c->side[i].o, m);
- evas_object_show(c->side[i].o);
+ eo_do(c->side[i].o, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m),
+ evas_obj_visibility_set(EINA_TRUE));
}
else
- evas_object_hide(c->side[i].o);
-
+ eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE));
+
order[i] = i;
for (j = 0; j < 4; j++)
evas_map_point_coord_get(m, j, NULL, NULL, &(tz[j]));
@@ -156,17 +156,17 @@ _cube_pos(Cube *c,
}
while (!sorted);
- evas_object_raise(c->side[order[0]].o);
+ eo_do(c->side[order[0]].o, evas_obj_raise());
for (i = 1; i < 6; i++)
- evas_object_stack_below(c->side[order[i]].o, c->side[order[i - 1]].o);
+ eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o));
}
static void
_cube_free(Cube *c)
{
int i;
-
- for (i = 0; i < 6; i++) evas_object_del(c->side[i].o);
+
+ for (i = 0; i < 6; i++) eo_del(c->side[i].o);
free(c);
}
@@ -187,8 +187,8 @@ static void _cleanup(void)
/* loop - do things */
static void _loop(double t, int f)
{
- _cube_pos(cubes[0],
- (win_w / 2), (win_h / 2), 0,
+ _cube_pos(cubes[0],
+ (win_w / 2), (win_h / 2), 0,
0, f, 0);
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c
index 80c1b0c..b1599bd 100644
--- a/src/bin/image_map_3d_flow.c
+++ b/src/bin/image_map_3d_flow.c
@@ -28,24 +28,24 @@ static void _setup(void)
for (i = 0; i < CNUM; i++)
{
char buf[256];
-
- o = evas_object_image_add(evas);
- o_images[i] = o;
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
-
- o = evas_object_image_add(evas);
- o_reflec[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_reflec[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
- evas_object_image_file_set(o, build_path(buf), NULL);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path(buf), NULL),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -54,8 +54,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < CNUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < CNUM; i++) evas_object_del(o_reflec[i]);
+ for (i = 0; i < CNUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < CNUM; i++) eo_del(o_reflec[i]);
}
/* loop - do things */
@@ -114,73 +114,73 @@ static void _loop(double t, int f)
if (z < 0) z = -z;
z = (w / 2) - z;
}
-
+
x += c;
-
+
x -= (w / 2);
xx = x + w;
y -= (h / 2);
yy = y + h;
-
+
if (c <= 0)
{
- evas_object_raise(o_images[i]);
- evas_object_raise(o_reflec[i]);
+ eo_do(o_images[i], evas_obj_raise());
+ eo_do(o_reflec[i], evas_obj_raise());
}
else
{
- evas_object_lower(o_images[i]);
- evas_object_lower(o_reflec[i]);
+ eo_do(o_images[i], evas_obj_lower());
+ eo_do(o_reflec[i], evas_obj_lower());
}
-
+
evas_map_point_coord_set (m, 0, x, y, -z);
evas_map_point_image_uv_set(m, 0, 0, 0);
evas_map_point_color_set (m, 0, 255, 255, 255, 255);
-
+
evas_map_point_coord_set (m, 1, xx, y, -z);
evas_map_point_image_uv_set(m, 1, 256, 0);
evas_map_point_color_set (m, 1, 255, 255, 255, 255);
-
+
evas_map_point_coord_set (m, 2, xx, yy, -z);
evas_map_point_image_uv_set(m, 2, 256, 256);
evas_map_point_color_set (m, 2, 255, 255, 255, 255);
-
+
evas_map_point_coord_set (m, 3, x, yy, -z);
evas_map_point_image_uv_set(m, 3, 0, 256);
evas_map_point_color_set (m, 3, 255, 255, 255, 255);
-
- evas_map_util_3d_rotate(m, 0, ang, 0,
+
+ evas_map_util_3d_rotate(m, 0, ang, 0,
x + (w / 2), y + (h / 2), 0);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
-
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
evas_map_point_coord_set (m, 0, x, yy, -z);
evas_map_point_image_uv_set(m, 0, 0, 256);
evas_map_point_color_set (m, 0, 128, 128, 128, 128);
-
+
evas_map_point_coord_set (m, 1, xx, yy, -z);
evas_map_point_image_uv_set(m, 1, 256, 256);
evas_map_point_color_set (m, 1, 128, 128, 128, 128);
-
+
evas_map_point_coord_set (m, 2, xx, yy + h, -z);
evas_map_point_image_uv_set(m, 2, 256, 0);
evas_map_point_color_set (m, 2, 0, 0, 0, 0);
-
+
evas_map_point_coord_set (m, 3, x, yy + h, -z);
evas_map_point_image_uv_set(m, 3, 0, 0);
evas_map_point_color_set (m, 3, 0, 0, 0, 0);
-
- evas_map_util_3d_rotate(m, 0, ang, 0,
+
+ evas_map_util_3d_rotate(m, 0, ang, 0,
x + (w / 2), y + (h / 2), 0);
evas_map_util_3d_perspective(m, (win_w / 2), (win_h / 2), -256, 512);
-
- evas_object_map_enable_set(o_reflec[i], 1);
- evas_object_map_set(o_reflec[i], m);
+
+ eo_do(o_reflec[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
-
+
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c
index a515c25..7707e3f 100644
--- a/src/bin/image_map_color_alpha_nearest_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_rotate.c
@@ -24,13 +24,13 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_alpha_nearest_solid_rotate.c b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
index c8012dd..c64792e 100644
--- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c
@@ -24,13 +24,13 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -53,13 +53,13 @@ static void _loop(double t, int f)
for (i = 0; i < (OBNUM / 2); i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
+ y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+ evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
evas_map_point_color_set(m, 0, 255, 255, 255, 255);
evas_map_point_color_set(m, 1, 255, 0, 0, 255);
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c
index 9b7511d..dab928b 100644
--- a/src/bin/image_map_color_alpha_rotate.c
+++ b/src/bin/image_map_color_alpha_rotate.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -51,13 +51,13 @@ static void _loop(double t, int f)
for (i = 0; i < (OBNUM / 2); i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
+ y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+ evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
evas_map_point_color_set(m, 0, 255, 255, 255, 255);
evas_map_point_color_set(m, 1, 255, 0, 0, 255);
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c
index d748b8d..dba87a7 100644
--- a/src/bin/image_map_color_alpha_solid_rotate.c
+++ b/src/bin/image_map_color_alpha_solid_rotate.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -65,8 +65,8 @@ static void _loop(double t, int f)
evas_map_point_color_set(m, 3, 0, 0, 0, 0);
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c
index 1cfcc1f..19e31ac 100644
--- a/src/bin/image_map_color_nearest_rotate.c
+++ b/src/bin/image_map_color_nearest_rotate.c
@@ -24,13 +24,13 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c
index 868f59c..6134a37 100644
--- a/src/bin/image_map_color_nearest_solid_rotate.c
+++ b/src/bin/image_map_color_nearest_solid_rotate.c
@@ -24,13 +24,13 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -68,8 +68,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c
index 026e456..0b35732 100644
--- a/src/bin/image_map_color_rotate.c
+++ b/src/bin/image_map_color_rotate.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c
index 91e4a3a..65cbb53 100644
--- a/src/bin/image_map_color_solid_rotate.c
+++ b/src/bin/image_map_color_solid_rotate.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -51,13 +51,13 @@ static void _loop(double t, int f)
for (i = 0; i < (OBNUM / 2); i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
+ y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+ evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
evas_map_point_color_set(m, 0, 255, 255, 255, 255);
evas_map_point_color_set(m, 1, 255, 0, 0, 255);
@@ -66,8 +66,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c
index aaa8ff7..24acb03 100644
--- a/src/bin/image_map_nearest_rotate.c
+++ b/src/bin/image_map_nearest_rotate.c
@@ -24,13 +24,13 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -53,18 +53,18 @@ static void _loop(double t, int f)
for (i = 0; i < (OBNUM / 2); i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
+ y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+ evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c
index 3c2696f..15cc61c 100644
--- a/src/bin/image_map_nearest_solid_rotate.c
+++ b/src/bin/image_map_nearest_solid_rotate.c
@@ -24,13 +24,13 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -53,18 +53,18 @@ static void _loop(double t, int f)
for (i = 0; i < (OBNUM / 2); i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
+ y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+ evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c
index d84f84b..8187958 100644
--- a/src/bin/image_map_rotate.c
+++ b/src/bin/image_map_rotate.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -51,18 +51,18 @@ static void _loop(double t, int f)
for (i = 0; i < (OBNUM / 2); i++)
{
w = 120;
- h = 160;
- x = (win_w / 2) - (w / 2);
+ h = 160;
+ x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
- y = (win_h / 2) - (h / 2);
+ y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
+ evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c
index fc0b3ce..ad6dd89 100644
--- a/src/bin/image_map_solid_rotate.c
+++ b/src/bin/image_map_solid_rotate.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < (OBNUM / 2); i++) evas_object_del(o_images[i]);
+ for (i = 0; i < (OBNUM / 2); i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c
index 3677990..b8053d4 100644
--- a/src/bin/image_mask.c
+++ b/src/bin/image_mask.c
@@ -23,20 +23,20 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i+= 2)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path("image.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("image.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i + 1] = o;
- evas_object_image_file_set(o, build_path("e-logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
- evas_object_clip_set(o_images[i],o);
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_images[i], evas_obj_clip_set(o));
}
done = 0;
}
@@ -45,7 +45,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_images[i + 1], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_images[i + 1], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c
index 721c56e..0842da1 100644
--- a/src/bin/image_mask_10.c
+++ b/src/bin/image_mask_10.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("texture.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, win_w * 4, win_h * 4);
- evas_object_resize(o, win_w * 4, win_h * 4);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
+ evas_obj_image_fill_set(0, 0, win_w * 4, win_h * 4),
+ evas_obj_size_set(win_w * 4, win_h * 4),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -65,12 +65,12 @@ static void _loop(double t, int f)
h = win_h * 4;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- evas_map_util_points_populate_from_geometry(m,
+ evas_map_util_points_populate_from_geometry(m,
-win_w, -win_h,
win_w * 4, win_h * 4, 0);
evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
- evas_object_map_enable_set(o_images[i], 1);
- evas_object_map_set(o_images[i], m);
+ eo_do(o_images[i], evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c
index 8489bc9..8a506bf 100644
--- a/src/bin/image_mask_11.c
+++ b/src/bin/image_mask_11.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -66,7 +66,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
if (!m) m = evas_map_new(4);
evas_map_util_points_populate_from_geometry(m,
@@ -74,8 +74,8 @@ static void _loop(double t, int f)
(win_h - 420) / 2,
720, 420, 0);
evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
- evas_object_map_enable_set(o_mask, 1);
- evas_object_map_set(o_mask, m);
+ eo_do(o_mask, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c
index fb94e58..ec08616 100644
--- a/src/bin/image_mask_12.c
+++ b/src/bin/image_mask_12.c
@@ -22,21 +22,21 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_text_add(evas);
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_mask = o;
- evas_object_text_font_set(o, "Vera-Bold", 150);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 150),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("texture.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 500, 444);
- evas_object_resize(o, win_w * 4, win_h * 4);
-// evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 500, 444),
+ evas_obj_size_set(win_w * 4, win_h * 4));
+ // eo_do(o, evas_obj_clip_set(o_mask));
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -45,8 +45,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -67,12 +67,12 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
- evas_object_text_text_set(o_mask, strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_color_set(o_mask, 255, 255, 255, 255);
- evas_object_geometry_get(o_mask, NULL, NULL, &w, &h);
- evas_object_move(o_mask, (win_w - w) / 2, (win_h - h) / 2);
+ eo_do(o_mask, evas_obj_text_text_set(strs[rnd() % (sizeof(strs) / sizeof(char *))]),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_size_get(&w, &h),
+ evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2));
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c
index 559b657..b84545c 100644
--- a/src/bin/image_mask_13.c
+++ b/src/bin/image_mask_13.c
@@ -22,21 +22,21 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_text_add(evas);
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_mask = o;
- evas_object_text_font_set(o, "Vera-Bold", 150);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 150),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
- evas_object_clip_set(o, o_mask);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE),
+ evas_obj_clip_set(o_mask));
}
done = 0;
}
@@ -45,8 +45,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -67,12 +67,12 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
- evas_object_text_text_set(o_mask, strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_color_set(o_mask, 255, 255, 255, 255);
- evas_object_geometry_get(o_mask, NULL, NULL, &w, &h);
- evas_object_move(o_mask, (win_w - w) / 2, (win_h - h) / 2);
+ eo_do(o_mask, evas_obj_text_text_set(strs[rnd() % (sizeof(strs) / sizeof(char *))]),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_size_get(&w, &h),
+ evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2));
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_14.c b/src/bin/image_mask_14.c
index a2a5d83..8f19836 100644
--- a/src/bin/image_mask_14.c
+++ b/src/bin/image_mask_14.c
@@ -22,25 +22,25 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 1);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(1),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -49,8 +49,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -68,9 +68,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_15.c b/src/bin/image_mask_15.c
index f6a1abe..5aa36e5 100644
--- a/src/bin/image_mask_15.c
+++ b/src/bin/image_mask_15.c
@@ -22,25 +22,25 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_image_smooth_scale_set(o, 0);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_smooth_scale_set(0),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -49,8 +49,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -68,9 +68,9 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_2.c b/src/bin/image_mask_2.c
index 550bd3a..4f3de0c 100644
--- a/src/bin/image_mask_2.c
+++ b/src/bin/image_mask_2.c
@@ -23,20 +23,20 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i+= 2)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("e-logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
- o = evas_object_image_add(evas);
- o_images[i + 1] = o;
- evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
- evas_object_clip_set(o_images[i], o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i + 1] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_images[i], evas_obj_clip_set(o));
}
done = 0;
}
@@ -45,7 +45,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_images[i + 1], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_images[i + 1], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c
index 39978b3..cb47660 100644
--- a/src/bin/image_mask_3.c
+++ b/src/bin/image_mask_3.c
@@ -23,20 +23,20 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i+= 2)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
- o = evas_object_image_add(evas);
- o_images[i + 1] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
- evas_object_clip_set(o_images[i], o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i + 1] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_images[i], evas_obj_clip_set(o));
}
done = 0;
}
@@ -45,7 +45,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_images[i + 1], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_images[i + 1], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c
index 1657437..2636f9b 100644
--- a/src/bin/image_mask_4.c
+++ b/src/bin/image_mask_4.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c
index 288a120..c112879 100644
--- a/src/bin/image_mask_5.c
+++ b/src/bin/image_mask_5.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_move(o, (win_w - 120) / 2, (win_h - 160) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_position_set((win_w - 120) / 2, (win_h - 160) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c
index caac8f0..d6dff93 100644
--- a/src/bin/image_mask_6.c
+++ b/src/bin/image_mask_6.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120 / 2, 160 / 2);
- evas_object_resize(o, 120 / 2, 160 / 2);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120 / 2, 160 / 2),
+ evas_obj_size_set(120 / 2, 160 / 2),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c
index a8ccb87..cb18ed5 100644
--- a/src/bin/image_mask_7.c
+++ b/src/bin/image_mask_7.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-2.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_move(o, (win_w - 120) / 2, (win_h - 160) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-2.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_position_set((win_w - 120) / 2, (win_h - 160) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -65,13 +65,13 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW))));
h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW))));
- evas_object_image_fill_set(o_mask, 0, 0, w, h);
- evas_object_resize(o_mask, w, h);
- evas_object_move(o_mask, (win_w - w) / 2, (win_h - h) / 2);
+ eo_do(o_mask, evas_obj_image_fill_set(0, 0, w, h),
+ evas_obj_size_set(w, h),
+ evas_obj_position_set((win_w - w) / 2, (win_h - h) / 2));
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_8.c b/src/bin/image_mask_8.c
index 961a44d..851acb6 100644
--- a/src/bin/image_mask_8.c
+++ b/src/bin/image_mask_8.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("texture.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 500, 444);
- evas_object_resize(o, win_w * 4, win_h * 4);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 500, 444),
+ evas_obj_size_set(win_w * 4, win_h * 4),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c
index f39d80e..2483fb4 100644
--- a/src/bin/image_mask_9.c
+++ b/src/bin/image_mask_9.c
@@ -22,24 +22,24 @@ static void _setup(void)
{
int i;
Evas_Object *o;
-
- o = evas_object_image_add(evas);
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_mask = o;
- evas_object_image_file_set(o, build_path("e-logo-mask.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 720, 420);
- evas_object_resize(o, 720, 420);
- evas_object_move(o, (win_w - 720) / 2, (win_h - 420) / 2);
- evas_object_show(o);
-
+ eo_do(o, evas_obj_image_file_set(build_path("e-logo-mask.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 720, 420),
+ evas_obj_size_set(720, 420),
+ evas_obj_position_set((win_w - 720) / 2, (win_h - 420) / 2),
+ evas_obj_visibility_set(EINA_TRUE));
+
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
- o_images[i] = o;
- evas_object_image_file_set(o, build_path("texture.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 500, 444);
- evas_object_resize(o, win_w * 4, win_h * 4);
- evas_object_clip_set(o, o_mask);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_file_set(build_path("texture.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 500, 444),
+ evas_obj_size_set(win_w * 4, win_h * 4),
+ evas_obj_clip_set(o_mask),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -48,8 +48,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
- evas_object_del(o_mask);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
+ eo_del(o_mask);
}
/* loop - do things */
@@ -66,17 +66,17 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (500 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (444 / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
if (!m) m = evas_map_new(4);
-
- evas_map_util_points_populate_from_geometry(m,
- (win_w - 720) / 2,
- (win_h - 420) / 2,
+
+ evas_map_util_points_populate_from_geometry(m,
+ (win_w - 720) / 2,
+ (win_h - 420) / 2,
720, 420, 0);
evas_map_util_rotate(m, f, win_w / 2, win_h / 2);
- evas_object_map_enable_set(o_mask, 1);
- evas_object_map_set(o_mask, m);
+ eo_do(o_mask, evas_obj_map_enable_set(1),
+ evas_obj_map_set(m));
FPS_STD(NAME);
}
diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c
index 57dbe9c..0088528 100644
--- a/src/bin/image_quality_scale.c
+++ b/src/bin/image_quality_scale.c
@@ -24,12 +24,12 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path("tp.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 640, 480);
- evas_object_resize(o, 640, 480);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 640, 480),
+ evas_obj_size_set(640, 480),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -38,7 +38,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < 1; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < 1; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -54,9 +54,9 @@ static void _loop(double t, int f)
h *= (f / 100.0) * 4.0;
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
- evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c
index 7ec9ebf..6d8a6d5 100644
--- a/src/bin/poly_blend.c
+++ b/src/bin/poly_blend.c
@@ -19,39 +19,39 @@ static Evas_Object *o_images[OBNUM];
static void
poly(Evas_Object *o, int type, Evas_Coord x, Evas_Coord y)
{
- evas_object_polygon_points_clear(o);
+ eo_do(o, evas_obj_polygon_points_clear());
switch (type % 4)
{
case 0: /* triangle */
- evas_object_polygon_point_add(o, x + 50 , y + 0);
- evas_object_polygon_point_add(o, x + 100, y + 100);
- evas_object_polygon_point_add(o, x + 0 , y + 100);
+ eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
+ evas_obj_polygon_point_add(x + 100, y + 100),
+ evas_obj_polygon_point_add(x + 0 , y + 100));
break;
case 1: /* square */
- evas_object_polygon_point_add(o, x + 0 , y + 0);
- evas_object_polygon_point_add(o, x + 100, y + 0);
- evas_object_polygon_point_add(o, x + 100, y + 100);
- evas_object_polygon_point_add(o, x + 0 , y + 100);
+ eo_do(o, evas_obj_polygon_point_add(x + 0 , y + 0),
+ evas_obj_polygon_point_add(x + 100, y + 0),
+ evas_obj_polygon_point_add(x + 100, y + 100),
+ evas_obj_polygon_point_add(x + 0 , y + 100));
break;
case 2: /* hex */
- evas_object_polygon_point_add(o, x + 50 , y + 0);
- evas_object_polygon_point_add(o, x + 100, y + 30);
- evas_object_polygon_point_add(o, x + 100, y + 70);
- evas_object_polygon_point_add(o, x + 50 , y + 100);
- evas_object_polygon_point_add(o, x + 0 , y + 70);
- evas_object_polygon_point_add(o, x + 0 , y + 30);
+ eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
+ evas_obj_polygon_point_add(x + 100, y + 30),
+ evas_obj_polygon_point_add(x + 100, y + 70),
+ evas_obj_polygon_point_add(x + 50 , y + 100),
+ evas_obj_polygon_point_add(x + 0 , y + 70),
+ evas_obj_polygon_point_add(x + 0 , y + 30));
break;
case 3: /* star */
- evas_object_polygon_point_add(o, x + 50 , y + 0);
- evas_object_polygon_point_add(o, x + 60 , y + 40);
- evas_object_polygon_point_add(o, x + 90 , y + 30);
- evas_object_polygon_point_add(o, x + 70 , y + 60);
- evas_object_polygon_point_add(o, x + 90 , y + 100);
- evas_object_polygon_point_add(o, x + 50 , y + 70);
- evas_object_polygon_point_add(o, x + 10 , y + 100);
- evas_object_polygon_point_add(o, x + 30 , y + 60);
- evas_object_polygon_point_add(o, x + 10 , y + 30);
- evas_object_polygon_point_add(o, x + 40 , y + 40);
+ eo_do(o, evas_obj_polygon_point_add(x + 50 , y + 0),
+ evas_obj_polygon_point_add(x + 60 , y + 40),
+ evas_obj_polygon_point_add(x + 90 , y + 30),
+ evas_obj_polygon_point_add(x + 70 , y + 60),
+ evas_obj_polygon_point_add(x + 90 , y + 100),
+ evas_obj_polygon_point_add(x + 50 , y + 70),
+ evas_obj_polygon_point_add(x + 10 , y + 100),
+ evas_obj_polygon_point_add(x + 30 , y + 60),
+ evas_obj_polygon_point_add(x + 10 , y + 30),
+ evas_obj_polygon_point_add(x + 40 , y + 40));
break;
default:
break;
@@ -68,15 +68,15 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_polygon_add(evas);
+ o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
poly(o, i, 0, 0);
- evas_object_show(o);
}
done = 0;
}
@@ -85,7 +85,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -98,12 +98,12 @@ static void _loop(double t, int f)
for (i = 0; i < OBNUM; i++)
{
o = o_images[i];
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
+ eo_do(o, evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 4);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 4);
- evas_object_move(o, x, y);
+ eo_do(o, evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c
index f1debcd..3d976bd 100644
--- a/src/bin/proxy_image.c
+++ b/src/bin/proxy_image.c
@@ -22,22 +22,22 @@ static void _setup(void)
int i;
Evas_Object *o,*src;
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_visibility_set(EINA_TRUE));
src = o;
o_images[0] = src;
for (i = 1; i < OBNUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_source_set(o, src);
- evas_object_resize(o, 120, 160);
- evas_object_image_fill_set(o, 0,0,120,160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_source_set(src, NULL),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_fill_set(0,0,120,160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -46,7 +46,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -62,7 +62,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c
index b147142..5693ed4 100644
--- a/src/bin/proxy_image_offscreen.c
+++ b/src/bin/proxy_image_offscreen.c
@@ -26,21 +26,21 @@ static void _setup(void)
int i;
Evas_Object *o,*src;
- o = evas_object_image_add(evas);
- evas_object_image_file_set(o, build_path("logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_move(o, -400, -300);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_position_set(-400, -300));
src = o;
for (i = 0; i < OBNUM / 2; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_source_set(o, src);
- evas_object_resize(o, 120, 160);
- evas_object_image_fill_set(o, 0,0,120,160);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_source_set(src, NULL),
+ evas_obj_size_set(120, 160),
+ evas_obj_image_fill_set(0,0,120,160),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -49,7 +49,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -65,7 +65,7 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
- evas_object_move(o_images[i], x, y);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c
index c589a57..4a4a358 100644
--- a/src/bin/proxy_text_fixed.c
+++ b/src/bin/proxy_text_fixed.c
@@ -27,30 +27,31 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
{
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 20);
- evas_object_text_text_set(o, "This is a test string");
- evas_object_text_style_set(o, st);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
- evas_object_text_glow_color_set(o, 100, 80, 40, 100);
- evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
- evas_object_text_outline_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
+ evas_obj_text_text_set("This is a test string"),
+ evas_obj_text_style_set(st),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_text_shadow_color_set(0, 0, 0, 24),
+ evas_obj_text_glow_color_set(100, 80, 40, 100),
+ evas_obj_text_glow2_color_set(50, 10, 5, 50),
+ evas_obj_text_outline_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
st++;
}
for ( ; i < OBNUM ; i ++)
{
s = o_texts[i % st];
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o;
- evas_object_image_source_set(o, s);
- evas_object_geometry_get(s, NULL, NULL, &w, &h);
- evas_object_resize(o, w, h);
- evas_object_image_fill_set(o, 0, 0, w, h);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_source_set(s, NULL));
+ /* FIXME s == NULL*/
+ eo_do(s, evas_obj_size_get(&w, &h));
+ eo_do(o, evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
@@ -60,7 +61,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -70,12 +71,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+ eo_do(o_texts[i], evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o_texts[i], x, y);
+ eo_do(o_texts[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c
index 32fbfba..1edfd96 100644
--- a/src/bin/proxy_text_random.c
+++ b/src/bin/proxy_text_random.c
@@ -30,41 +30,39 @@ static void _setup(void)
"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
};
srnd();
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[0] = o;
- evas_object_text_font_set(o, "Vera-Bold", 20);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_text_text_set(o, buf);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
+ eo_do(o, evas_obj_text_text_set(buf));
+ eo_do(o, evas_obj_color_set(0, 0, 0, 255));
+ eo_do(o, evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o, x, y);
- evas_object_show(o);
+ eo_do(o, evas_obj_position_set(x, y));
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
for (i = 1 ; i < OBNUM ; i ++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o;
- evas_object_image_source_set(o, o_texts[0]);
- evas_object_geometry_get(o_texts[0], NULL, NULL, &w, &h);
- evas_object_resize(o, w, h);
- evas_object_image_fill_set(o, 0, 0, w, h);
+ eo_do(o, evas_obj_image_source_set(o_texts[0], NULL));
+ eo_do(o_texts[0], evas_obj_size_get(&w, &h));
+ eo_do(o, evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h));
x = (win_w / 2) - (w / 2);
x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o, x, y);
-
- evas_object_show(o);
+ eo_do(o, evas_obj_position_set(x, y),
+ evas_obj_visibility_set(EINA_TRUE));
}
-
done = 0;
}
@@ -72,7 +70,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -90,12 +88,12 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_text_text_set(o_texts[0], buf);
- evas_object_geometry_get(o_texts[0], NULL, NULL, &w, &h);
+ eo_do(o_texts[0], evas_obj_text_text_set(buf));
+ eo_do(o_texts[0], evas_obj_size_get(&w, &h));
for (i = 1; i < OBNUM; i++)
{
- evas_object_resize(o_texts[i],w,h);
- evas_object_image_fill_set(o_texts[i],0,0,w,h);
+ eo_do(o_texts[i], evas_obj_size_set(w,h));
+ eo_do(o_texts[i], evas_obj_image_fill_set(0,0,w,h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c
index fb5cb8e..164ff2d 100644
--- a/src/bin/rect_blend.c
+++ b/src/bin/rect_blend.c
@@ -26,14 +26,14 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_rectangle_add(evas);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -60,8 +60,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c
index 15bab8a..452b16d 100644
--- a/src/bin/rect_blend_few.c
+++ b/src/bin/rect_blend_few.c
@@ -29,14 +29,14 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_rectangle_add(evas);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -45,7 +45,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c
index 381170d..3220972 100644
--- a/src/bin/rect_blend_pow2.c
+++ b/src/bin/rect_blend_pow2.c
@@ -26,15 +26,15 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_rectangle_add(evas);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -43,7 +43,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -61,8 +61,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_blend_pow2_few.c b/src/bin/rect_blend_pow2_few.c
index 7c1f409..309ba90 100644
--- a/src/bin/rect_blend_pow2_few.c
+++ b/src/bin/rect_blend_pow2_few.c
@@ -29,15 +29,15 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_rectangle_add(evas);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -46,7 +46,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -64,8 +64,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c
index c51df40..1c13405 100644
--- a/src/bin/rect_solid.c
+++ b/src/bin/rect_solid.c
@@ -26,14 +26,14 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_rectangle_add(evas);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 0xff;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -42,7 +42,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -60,8 +60,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c
index 1976d3d..c31801e 100644
--- a/src/bin/rect_solid_few.c
+++ b/src/bin/rect_solid_few.c
@@ -29,14 +29,14 @@ static void _setup(void)
{
int r, g, b, a;
- o = evas_object_rectangle_add(evas);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o;
a = 0xff;
r = ((rnd()&0xff) * a) / 255;
g = ((rnd()&0xff) * a) / 255;
b = ((rnd()&0xff) * a) / 255;
- evas_object_color_set(o, r, g, b, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(r, g, b, a),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -45,7 +45,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
}
/* loop - do things */
@@ -63,8 +63,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_images[i], x, y);
- evas_object_resize(o_images[i], w, h);
+ eo_do(o_images[i], evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h));
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c
index 80c5353..0c42e92 100644
--- a/src/bin/text_basic.c
+++ b/src/bin/text_basic.c
@@ -25,12 +25,12 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 20);
- evas_object_text_text_set(o, "This is a test string");
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
+ evas_obj_text_text_set("This is a test string"),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -39,7 +39,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -49,12 +49,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+ eo_do(o_texts[i], evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o_texts[i], x, y);
+ eo_do(o_texts[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_change.c b/src/bin/text_change.c
index d7d79f2..d4b9b61 100644
--- a/src/bin/text_change.c
+++ b/src/bin/text_change.c
@@ -32,23 +32,23 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 20);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_text_text_set(o, buf);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
+ eo_do(o, evas_obj_text_text_set(buf),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)((i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)((i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o, x, y);
- evas_object_show(o);
+ eo_do(o, evas_obj_position_set(x, y),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -57,7 +57,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -77,7 +77,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_text_text_set(o_texts[i], buf);
+ eo_do(o_texts[i], evas_obj_text_text_set(buf));
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c
index 82e9943..67ec8f3 100644
--- a/src/bin/text_styles.c
+++ b/src/bin/text_styles.c
@@ -27,17 +27,17 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 20);
- evas_object_text_text_set(o, "This is a test string");
- evas_object_text_style_set(o, st);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
- evas_object_text_glow_color_set(o, 100, 80, 40, 100);
- evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
- evas_object_text_outline_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
+ evas_obj_text_text_set("This is a test string"),
+ evas_obj_text_style_set(st),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_text_shadow_color_set(0, 0, 0, 24),
+ evas_obj_text_glow_color_set(100, 80, 40, 100),
+ evas_obj_text_glow2_color_set(50, 10, 5, 50),
+ evas_obj_text_outline_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
st++;
if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
}
@@ -48,7 +48,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -58,12 +58,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+ eo_do(o_texts[i], evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o_texts[i], x, y);
+ eo_do(o_texts[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/text_styles_different_strings.c b/src/bin/text_styles_different_strings.c
index 8a87333..696178f 100644
--- a/src/bin/text_styles_different_strings.c
+++ b/src/bin/text_styles_different_strings.c
@@ -34,22 +34,22 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; i < OBNUM; i++)
{
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 20);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]);
- evas_object_text_text_set(o, buf);
- evas_object_text_style_set(o, st);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
- evas_object_text_glow_color_set(o, 100, 80, 40, 100);
- evas_object_text_glow2_color_set(o, 50, 10, 5, 50);
- evas_object_text_outline_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_text_set(buf),
+ evas_obj_text_style_set(st),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_text_shadow_color_set(0, 0, 0, 24),
+ evas_obj_text_glow_color_set(100, 80, 40, 100),
+ evas_obj_text_glow2_color_set(50, 10, 5, 50),
+ evas_obj_text_outline_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
st++;
if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW;
}
@@ -60,7 +60,7 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < OBNUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < OBNUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -70,12 +70,12 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++)
{
- evas_object_geometry_get(o_texts[i], NULL, NULL, &w, &h);
+ eo_do(o_texts[i], evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
- evas_object_move(o_texts[i], x, y);
+ eo_do(o_texts[i], evas_obj_position_set(x, y));
}
FPS_STD(NAME);
}
diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c
index d49d716..6a1b489 100644
--- a/src/bin/textblock_auto_align.c
+++ b/src/bin/textblock_auto_align.c
@@ -23,19 +23,18 @@ static void _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
- o = evas_object_textblock_add(evas);
+ o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o;
st = evas_textblock_style_new();
evas_textblock_style_set
(st,
"DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
);
- evas_object_textblock_style_set(o, st);
+ eo_do(o, evas_obj_textblock_style_set(st));
evas_textblock_style_free(st);
- evas_object_textblock_clear(o);
+ eo_do(o, evas_obj_textblock_clear());
- evas_object_textblock_text_markup_set
- (o,
+ eo_do(o, evas_obj_textblock_text_markup_set(
"This is a test of auto alignment in Evas"
"
"
"This text should be left aligned"
@@ -53,9 +52,9 @@ static void _setup(void)
"words should appear in the following order: 'דוגמה' first, 'of' second,
"
"'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left"
"דוגמה of טקסט in english."
- );
+ ));
- evas_object_show(o);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
done = 0;
}
@@ -63,7 +62,7 @@ static void _setup(void)
/* cleanup */
static void _cleanup(void)
{
- evas_object_del(o_text);
+ eo_del(o_text);
}
/* loop - do things */
@@ -72,14 +71,14 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h, w0, h0;
int i = 0;
- evas_object_textblock_size_native_get(o_text, &w0, &h0);
+ eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
w = w0;
h = h0;
w += fabs(sin((double)(f + (i * 13)) / (31.1 * SLOW))) * (w0);
x = (win_w / 2) - (w / 2);
y = (win_h / 2) - (h0 / 2);
- evas_object_move(o_text, x, y);
- evas_object_resize(o_text, w, h);
+ eo_do(o_text, evas_obj_position_set(x, y));
+ eo_do(o_text, evas_obj_size_set(w, h));
FPS_STD(NAME);
}
diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c
index 8e31749..a9cb70e 100644
--- a/src/bin/textblock_basic.c
+++ b/src/bin/textblock_basic.c
@@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
- o = evas_object_textblock_add(evas);
+ o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o;
st = evas_textblock_style_new();
evas_textblock_style_set
@@ -39,12 +39,11 @@ static void _setup(void)
"p='+ font=Vera,Kochi font_size=10 align=left'"
"/p='- \n'"
);
- evas_object_textblock_style_set(o, st);
+ eo_do(o, evas_obj_textblock_style_set(st));
evas_textblock_style_free(st);
- evas_object_textblock_clear(o);
+ eo_do(o, evas_obj_textblock_clear());
- evas_object_textblock_text_markup_set
- (o,
+ eo_do(o, evas_obj_textblock_text_markup_set(
"Title
"
"A pragraph here red text and stuff.
"
"And escaping < and > as well as & as
normal.
"
@@ -113,9 +112,9 @@ static void _setup(void)
"Heizölrückstoßabdämpfung fløde pingüino kilómetros cœur déçu l'âme "
"plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim"
""
- );
+ ));
- evas_object_show(o);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
done = 0;
}
@@ -123,7 +122,7 @@ static void _setup(void)
/* cleanup */
static void _cleanup(void)
{
- evas_object_del(o_text);
+ eo_del(o_text);
}
/* loop - do things */
@@ -140,8 +139,8 @@ static void _loop(double t, int f)
x += sin((double)(f + (i * 13)) / (86.7 * SLOW)) * (w0 / 2);
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2);
- evas_object_move(o_text, x, y);
- evas_object_resize(o_text, w, 5000);
+ eo_do(o_text, evas_obj_position_set(x, y));
+ eo_do(o_text, evas_obj_size_set(w, 5000));
FPS_STD(NAME);
}
diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c
index a0309cf..818d4f1 100644
--- a/src/bin/textblock_intl.c
+++ b/src/bin/textblock_intl.c
@@ -23,19 +23,18 @@ static void _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
- o = evas_object_textblock_add(evas);
+ o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o;
st = evas_textblock_style_new();
evas_textblock_style_set
(st,
"DEFAULT='font=Sans font_size=10 align=left color=#000000 wrap=word'"
);
- evas_object_textblock_style_set(o, st);
+ eo_do(o, evas_obj_textblock_style_set(st));
evas_textblock_style_free(st);
- evas_object_textblock_clear(o);
+ eo_do(o, evas_obj_textblock_clear());
- evas_object_textblock_text_markup_set
- (o,
+ eo_do(o, evas_obj_textblock_text_markup_set(
"This is a test of International test rendering in Evas
"
"
"
"Danish: 'Quizdeltagerne spiste jordbær med fløde, mens cirkusklovnen'
"
@@ -84,9 +83,9 @@ static void _setup(void)
"Thai: 'ยูนืโคด'
"
"Tibetan: 'ཨུ་ནི་ཀོཌྲ།'
"
"Yiddish: 'יוניקאָד'
"
- );
+ ));
- evas_object_show(o);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
done = 0;
}
@@ -94,7 +93,7 @@ static void _setup(void)
/* cleanup */
static void _cleanup(void)
{
- evas_object_del(o_text);
+ eo_del(o_text);
}
/* loop - do things */
@@ -103,15 +102,15 @@ static void _loop(double t, int f)
Evas_Coord x, y, w, h, w0, h0;
int i = 0;
- evas_object_textblock_size_native_get(o_text, &w0, &h0);
+ eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
w = w0;
h = h0;
x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (31.1 * SLOW)) * (w0 / (2 * 2));
y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2));
- evas_object_move(o_text, x, y);
- evas_object_resize(o_text, w, h);
+ eo_do(o_text, evas_obj_position_set(x, y));
+ eo_do(o_text, evas_obj_size_set(w, h));
FPS_STD(NAME);
}
diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c
index 10ca9fa..f2d6822 100644
--- a/src/bin/textblock_text_append.c
+++ b/src/bin/textblock_text_append.c
@@ -23,19 +23,17 @@ static void _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
- o = evas_object_textblock_add(evas);
+ o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o;
st = evas_textblock_style_new();
evas_textblock_style_set
(st,
"DEFAULT='font=Sans font_size=10 color=#000000 wrap=word'"
);
- evas_object_textblock_style_set(o, st);
+ eo_do(o, evas_obj_textblock_style_set(st));
evas_textblock_style_free(st);
- evas_object_textblock_clear(o);
-
- evas_object_textblock_text_markup_set
- (o,
+ eo_do(o, evas_obj_textblock_clear(),
+ evas_obj_textblock_text_markup_set(
"This test just appends and removes text from different paragraphs, it's "
"not a very visual test, it's included for benchmarking purposes."
""
@@ -94,11 +92,11 @@ static void _setup(void)
"Graphics"
""
"Enlightenment is built by designers and programmers who want others to be able to do more with less. Some of Enlightenment's libraries do not do anything with graphics at all, but it is the ones that do that are the shining stars of the Enlightenment world.Evas is the canvas layer. It is not a drawing library. It is not like OpenGL, Cairo, XRender, GDI, DirectFB etc. It is a scene graph library that retains state of all objects in it. They are created then manipulated until they are no longer needed, at which point they are deleted. This allows the programmer to work in terms that a designer thinks of. It is direct mapping, as opposed to having to convert the concepts into drawing commands in the right order, calculate minimum drawing calls needed to get the job done etc.Evas also handles abstracting the rendering mechanism. With zero changes the same application can move from software to OpenGL rendering, as they all use an abstracted scene graph to describe the world (canvas) to Evas. Evas supports multiple targets, but the most useful are the high-speed software rendering engines and OpenGL (as well as OpenGL-ES 2.0).Evas not only does quality rendering and compositing, but also can scale, rotate and fully 3D transform objects, allowing for sought-after 3D effects in your interfaces. It supplies these abilities in both software and OpenGL rendering, so you are never caught with unexpected loss of features. The software rendering is even fast enough to provide the 3D without any acceleration on devices for simple uses.Edje is a meta-object design library that is somewhere between Flash, PSD, SVG and HTML+CSS. It separates design out from code and into a dynamically loaded data file. This file is compressed and loaded very quickly, along with being cached and shared betweeen instances.This allows design to be provided at runtime by different design (EDJ) files, leaving the programmer to worry about overall application implementation and coarse grained UI as opposed to needing to worry about all the little details that the artists may vary even until the day before shipping the product.
"
- );
- evas_object_move(o_text, 0, 0);
- evas_object_resize(o_text, win_w, win_h);
+ ));
+ eo_do(o_text, evas_obj_position_set(0, 0),
+ evas_obj_size_set(win_w, win_h));
- evas_object_show(o);
+ eo_do(o, evas_obj_visibility_set(EINA_TRUE));
done = 0;
}
@@ -106,7 +104,7 @@ static void _setup(void)
/* cleanup */
static void _cleanup(void)
{
- evas_object_del(o_text);
+ eo_del(o_text);
}
/* loop - do things */
@@ -114,14 +112,14 @@ static void _loop(double t, int f)
{
Evas_Textblock_Cursor *cur;
static Evas_Textblock_Cursor *cur2;
- cur = (Evas_Textblock_Cursor *) evas_object_textblock_cursor_get(o_text);
+ eo_do(o_text, evas_obj_textblock_cursor_get(&cur));
evas_textblock_cursor_text_append(cur, "*");
evas_textblock_cursor_char_delete(cur);
evas_textblock_cursor_paragraph_char_first(cur);
if (!cur2)
{
- cur2 = evas_object_textblock_cursor_new(o_text);
+ eo_do(o_text, evas_obj_textblock_cursor_new(&cur2));
evas_textblock_cursor_paragraph_last(cur2);
evas_textblock_cursor_paragraph_char_first(cur2);
}
diff --git a/src/bin/ui.c b/src/bin/ui.c
index dc11c38..26ff841 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -237,14 +237,15 @@ _ui_all(void)
double avgw = 0.0;
Menu_Item *mi;
- evas_object_hide(o_menu_logo);
- evas_object_hide(o_menu_title);
- evas_object_hide(o_menu_icon);
- evas_object_hide(o_menu_icon_sel);
- evas_object_hide(o_menu_icon_sel2);
- evas_object_hide(o_menu_text_sel);
- evas_object_hide(o_title);
- evas_object_hide(o_byline);
+ eo_do(o_menu_logo, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon_sel, evas_obj_visibility_set(EINA_FALSE));
+ /* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */
+ eo_do(o_menu_icon_sel2, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_text_sel, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE));
EINA_LIST_FOREACH(menu, l, mi)
{
@@ -253,8 +254,8 @@ _ui_all(void)
(mi->func == _ui_all))
continue;
if (mi->func) mi->func();
- evas_object_hide(o_title);
- evas_object_hide(o_byline);
+ eo_do(o_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE));
while (p_fps == 0.0)
{
engine_loop();
@@ -364,14 +365,14 @@ _ui_num(int n)
unsigned int i;
double avgw = 0.0;
- evas_object_hide(o_menu_logo);
- evas_object_hide(o_menu_title);
- evas_object_hide(o_menu_icon);
- evas_object_hide(o_menu_icon_sel);
- evas_object_hide(o_menu_icon_sel2);
- evas_object_hide(o_menu_text_sel);
- evas_object_hide(o_title);
- evas_object_hide(o_byline);
+ eo_do(o_menu_logo, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon_sel, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon_sel2, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_text_sel, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE));
mi = eina_list_nth(menu, n);
if (mi)
{
@@ -380,8 +381,8 @@ _ui_num(int n)
(mi->func == _ui_all))
goto done;
if (mi->func) mi->func();
- evas_object_hide(o_title);
- evas_object_hide(o_byline);
+ eo_do(o_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE));
while (p_fps == 0.0)
{
ui_loop();
@@ -437,27 +438,27 @@ _ui_select(void)
int i;
void (*func) (void) = NULL;
- evas_object_hide(o_menu_logo);
- evas_object_hide(o_menu_title);
- evas_object_hide(o_menu_icon);
- evas_object_hide(o_menu_icon_sel);
- evas_object_hide(o_menu_icon_sel2);
- evas_object_hide(o_menu_text_sel);
- evas_object_hide(o_title);
- evas_object_hide(o_byline);
+ eo_do(o_menu_logo, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon_sel, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_icon_sel2, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_menu_text_sel, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE));
for (i = 0, l = menu; l; l = l->next, i++)
{
Menu_Item *mi;
mi = l->data;
- evas_object_hide(mi->o_icon);
+ eo_do(mi->o_icon, evas_obj_visibility_set(EINA_FALSE));
if (i == menu_sel)
func = mi->func;
}
menu_active = 0;
if (func) func();
- evas_object_hide(o_title);
- evas_object_hide(o_byline);
+ eo_do(o_title, evas_obj_visibility_set(EINA_FALSE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE));
}
static void
@@ -554,15 +555,16 @@ _ui_menu_item_add(char *icon, char *text, void (*func) (void))
Menu_Item *mi;
mi = malloc(sizeof(Menu_Item));
- mi->o_icon = evas_object_image_add(evas);
- evas_object_image_file_set(mi->o_icon, build_path(icon), NULL);
- evas_object_resize(mi->o_icon, 32, 32);
- evas_object_image_fill_set(mi->o_icon, 0, 0, 32, 32);
+ mi->o_icon = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_unref(mi->o_icon);
+ eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL),
+ evas_obj_size_set(32, 32),
+ evas_obj_image_fill_set(0, 0, 32, 32));
mi->icon = strdup(icon);
mi->text = strdup(text);
mi->func = func;
menu = eina_list_append(menu, mi);
- evas_object_raise(o_menu_icon_sel2);
+ eo_do(o_menu_icon_sel2, evas_obj_raise());
}
static void
@@ -572,94 +574,103 @@ _ui_setup(void)
Evas_Coord x, y, w, h;
time_t t0, t;
- o = evas_object_rectangle_add(evas);
- evas_object_move(o, 0, 0);
- evas_object_resize(o, win_w, win_h);
- evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_layer_set(o, 1000);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_position_set(0, 0),
+ evas_obj_size_set(win_w, win_h),
+ evas_obj_color_set(0, 0, 0, 0),
+ evas_obj_layer_set(1000),
+ evas_obj_focus_set(1),
+ evas_obj_visibility_set(EINA_TRUE));
evas_object_event_callback_add(o, EVAS_CALLBACK_KEY_DOWN, _ui_key, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _ui_mouse_down, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, _ui_mouse_up, NULL);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _ui_mouse_move, NULL);
- evas_object_focus_set(o, 1);
- evas_object_show(o);
o_bg = o;
- o = evas_object_rectangle_add(evas);
- evas_object_move(o, 0, 0);
- evas_object_resize(o, win_w, win_h);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_layer_set(o, -99);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_position_set(0, 0),
+ evas_obj_size_set(win_w, win_h),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_layer_set(-99),
+ evas_obj_visibility_set(EINA_TRUE));
o_wallpaper = o;
- o = evas_object_text_add(evas);
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, "EXPEDITE");
- evas_object_layer_set(o, 100);
- evas_object_color_set(o, 0, 0, 0, 100);
- evas_object_pass_events_set(o, 1);
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set("EXPEDITE"),
+ evas_obj_layer_set(100),
+ evas_obj_color_set(0, 0, 0, 100),
+ evas_obj_pass_events_set(1),
+ evas_obj_size_get(&w, &h));
x = (win_w - w) / 2;
y = 0;
- evas_object_move(o, x, y);
- evas_object_show(o);
+ eo_do(o, evas_obj_position_set(x, y),
+ evas_obj_visibility_set(EINA_TRUE));
o_title = o;
- o = evas_object_text_add(evas);
- evas_object_text_font_set(o, "Vera", 9);
- evas_object_text_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
- evas_object_layer_set(o, 100);
- evas_object_color_set(o, 0, 0, 0, 60);
- evas_object_pass_events_set(o, 1);
- evas_object_geometry_get(o, NULL, NULL, &w, NULL);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_text_font_set("Vera", 9),
+ evas_obj_text_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
+ evas_obj_layer_set(100),
+ evas_obj_color_set(0, 0, 0, 60),
+ evas_obj_pass_events_set(1),
+ evas_obj_size_get(&w, NULL));
x = (win_w - w) / 2;
y = h + 2;
- evas_object_move(o, x, y);
- evas_object_show(o);
+ eo_do(o, evas_obj_position_set(x, y),
+ evas_obj_visibility_set(EINA_TRUE));
o_byline = o;
- o = evas_object_image_add(evas);
- evas_object_move(o, (win_w - 120) / 2, ((win_h - 160) / 2));
- evas_object_image_file_set(o, build_path("e-logo.png"), NULL);
- evas_object_image_fill_set(o, 0, 0, 120, 160);
- evas_object_resize(o, 120, 160);
- evas_object_layer_set(o, -98);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
+ evas_obj_image_file_set(build_path("e-logo.png"), NULL),
+ evas_obj_image_fill_set(0, 0, 120, 160),
+ evas_obj_size_set(120, 160),
+ evas_obj_layer_set(-98),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_visibility_set(EINA_TRUE));
o_menu_logo = o;
- o = evas_object_image_add(evas);
- evas_object_move(o, win_w - 128, - 128);
- evas_object_image_fill_set(o, 0, 0, 256, 256);
- evas_object_resize(o, 256, 256);
- evas_object_show(o);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_position_set(win_w - 128, - 128),
+ evas_obj_image_fill_set(0, 0, 256, 256),
+ evas_obj_size_set(256, 256),
+ evas_obj_visibility_set(EINA_TRUE));
o_menu_icon = o;
- o = evas_object_image_add(evas);
- evas_object_move(o, 0, 0);
- evas_object_image_file_set(o, build_path("icon_sel.png"), NULL);
- evas_object_resize(o, 48, 48);
- evas_object_image_fill_set(o, 0, 0, 48, 48);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_position_set(0, 0),
+ evas_obj_image_file_set(build_path("icon_sel.png"), NULL),
+ evas_obj_size_set(48, 48),
+ evas_obj_image_fill_set(0, 0, 48, 48));
o_menu_icon_sel = o;
- o = evas_object_image_add(evas);
- evas_object_move(o, 0, 0);
- evas_object_image_file_set(o, build_path("text_sel.png"), NULL);
- evas_object_resize(o, 96, 32);
- evas_object_image_fill_set(o, 0, 0, 96, 32);
- evas_object_image_border_set(o, 7, 7, 7, 7);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_position_set(0, 0),
+ evas_obj_image_file_set(build_path("text_sel.png"), NULL),
+ evas_obj_size_set(96, 32),
+ evas_obj_image_fill_set(0, 0, 96, 32),
+ evas_obj_image_border_set(7, 7, 7, 7));
o_menu_text_sel = o;
- o = evas_object_text_add(evas);
- evas_object_text_font_set(o, "Vera", 10);
- evas_object_text_text_set(o, "");
- evas_object_color_set(o, 0, 0, 0, 100);
- evas_object_pass_events_set(o, 1);
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
+ eo_unref(o);
+ eo_do(o, evas_obj_text_font_set("Vera", 10),
+ evas_obj_text_text_set(""),
+ evas_obj_color_set(0, 0, 0, 100),
+ evas_obj_pass_events_set(1),
+ evas_obj_size_get(&w, &h));
x = (win_w - w) / 2;
y = (win_h - h) / 2;
- evas_object_move(o, x, y);
+ eo_do(o, evas_obj_position_set(x, y));
o_menu_title = o;
_ui_menu_item_add("e.png", "About", about_start);
@@ -760,8 +771,8 @@ ui_loop(void)
static double pt = 0.0;
double t, t2;
- evas_object_resize(o_bg, win_w, win_h);
- evas_object_resize(o_wallpaper, win_w, win_h);
+ eo_do(o_bg, evas_obj_size_set(win_w, win_h));
+ eo_do(o_wallpaper, evas_obj_size_set(win_w, win_h));
if (loop_func)
{
t = get_time();
@@ -816,21 +827,21 @@ ui_loop(void)
mi = l->data;
o = mi->o_icon;
- evas_object_geometry_get(o_menu_logo, NULL, NULL, &w, &h);
+ eo_do(o_menu_logo, evas_obj_size_get(&w, &h));
len = ((w * 3) + 10) / 4;
- evas_object_geometry_get(o, NULL, NULL, &w, &h);
+ eo_do(o, evas_obj_size_get(&w, &h));
x = (win_w / 2)
+ (sin((menu_anim - (double)i) * 0.33) * len)
- (w / 2);
y = (win_h / 2)
+ (cos((menu_anim - (double)i) * 0.33) * len)
- (h / 2);
- evas_object_move(o, x, y);
+ eo_do(o, evas_obj_position_set(x, y));
a = menu_anim - (double)i;
if (a < 0) a = -a;
a = 255 - (30 * a);
- evas_object_color_set(o, a, a, a, a);
- evas_object_show(o);
+ eo_do(o, evas_obj_color_set(a, a, a, a),
+ evas_obj_visibility_set(EINA_TRUE));
if (i == menu_sel)
{
@@ -839,16 +850,16 @@ ui_loop(void)
a = 255 - (255 * a);
o = o_menu_icon_sel;
- evas_object_move(o, x - ((48 - w) / 2), y - ((48 - h) / 2));
- evas_object_color_set(o, a, a, a, a);
+ eo_do(o, evas_obj_position_set(x - ((48 - w) / 2), y - ((48 - h) / 2)),
+ evas_obj_color_set(a, a, a, a));
o = o_menu_title;
- evas_object_color_set(o, a, a, a, a);
- evas_object_text_text_set(o, mi->text);
- evas_object_geometry_get(o, NULL, NULL, &tw, &th);
+ eo_do(o, evas_obj_color_set(a, a, a, a),
+ evas_obj_text_text_set(mi->text),
+ evas_obj_size_get(&tw, &th));
x = (win_w - tw) / 2;
y = (win_h / 2) + len + 48;
- evas_object_move(o, x, y);
+ eo_do(o, evas_obj_position_set(x, y));
o = o_menu_text_sel;
@@ -856,24 +867,24 @@ ui_loop(void)
h = 28;
x = x - 12;
y = y + ((th - h) / 2);
- evas_object_move(o, x, y);
- evas_object_resize(o, w, h);
- evas_object_image_fill_set(o, 0, 0, w, h);
- evas_object_color_set(o, a, a, a, a);
+ eo_do(o, evas_obj_position_set(x, y),
+ evas_obj_size_set(w, h),
+ evas_obj_image_fill_set(0, 0, w, h),
+ evas_obj_color_set(a, a, a, a));
o = o_menu_icon;
snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
- evas_object_image_file_set(o, buf, NULL);
- evas_object_color_set(o, a / 2, a / 2, a / 2, a / 2);
+ eo_do(o, evas_obj_image_file_set(buf, NULL),
+ evas_obj_color_set(a / 2, a / 2, a / 2, a / 2));
}
}
- evas_object_move(o_menu_logo, (win_w - 120) / 2, ((win_h - 160) / 2));
- evas_object_show(o_menu_logo);
- evas_object_show(o_menu_title);
- evas_object_show(o_menu_icon);
- evas_object_show(o_menu_icon_sel);
- evas_object_show(o_menu_icon_sel2);
- evas_object_show(o_menu_text_sel);
+ eo_do(o_menu_logo, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
+ evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_menu_title, evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_menu_icon, evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_menu_icon_sel, evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_menu_icon_sel2, evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_menu_text_sel, evas_obj_visibility_set(EINA_TRUE));
}
else
{
@@ -883,10 +894,10 @@ ui_loop(void)
void
ui_menu(void)
{
- evas_object_show(o_title);
- evas_object_show(o_byline);
- evas_object_text_text_set
- (o_byline, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
+ eo_do(o_title, evas_obj_visibility_set(EINA_TRUE));
+ eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE),
+ evas_obj_text_text_set
+ ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."));
menu_active = 1;
key_func = NULL;
loop_func = NULL;
@@ -910,7 +921,7 @@ ui_fps(double fps)
char buf[256];
snprintf(buf, sizeof(buf), "ESCAPE - exit, FPS: %4.3f", fps);
- evas_object_text_text_set(o_byline, buf);
+ eo_do(o_byline, evas_obj_text_text_set(buf));
*/
p_fps = fps;
}
diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c
index f603c57..23c9258 100644
--- a/src/bin/widgets_file_icons.c
+++ b/src/bin/widgets_file_icons.c
@@ -19,23 +19,23 @@ static int done = 0;
static Evas_Object *o_images[NUM];
static Evas_Object *o_texts[NUM];
-static const char *icons[] =
+static const char *icons[] =
{
"bug.png",
"bulb.png",
"camera.png",
"colorbox.png",
-
+
"e.png",
"error.png",
"flower.png",
"house.png",
-
+
"mushroom.png",
"pulse.png",
"typewriter.png",
"warning.png",
-
+
"watch.png"
};
@@ -46,21 +46,21 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 13]);
- evas_object_text_style_set(o, EVAS_TEXT_STYLE_FAR_SOFT_SHADOW);
- evas_object_color_set(o, 255, 255, 255, 255);
- evas_object_text_shadow_color_set(o, 0, 0, 0, 24);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 13]),
+ evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW),
+ evas_obj_color_set(255, 255, 255, 255),
+ evas_obj_text_shadow_color_set(0, 0, 0, 24),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -69,8 +69,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -82,10 +82,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_file_icons_2.c b/src/bin/widgets_file_icons_2.c
index 8536d3b..2150ee2 100644
--- a/src/bin/widgets_file_icons_2.c
+++ b/src/bin/widgets_file_icons_2.c
@@ -46,19 +46,19 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 13]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 13]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -67,8 +67,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -80,10 +80,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_file_icons_2_grouped.c b/src/bin/widgets_file_icons_2_grouped.c
index 31b6c1b..5ff3e74 100644
--- a/src/bin/widgets_file_icons_2_grouped.c
+++ b/src/bin/widgets_file_icons_2_grouped.c
@@ -46,27 +46,27 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 13]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 13]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_images[i]);
+ eo_do(o_images[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- if (i > 13) evas_object_stack_above(o_images[i], o_images[i - 13]);
+ if (i > 13) eo_do(o_images[i], evas_obj_stack_above(o_images[i - 13]));
}
done = 0;
}
@@ -75,8 +75,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -88,10 +88,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_file_icons_2_same.c b/src/bin/widgets_file_icons_2_same.c
index 7dbf9ff..cb2284d 100644
--- a/src/bin/widgets_file_icons_2_same.c
+++ b/src/bin/widgets_file_icons_2_same.c
@@ -31,19 +31,19 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 1]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 1]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 1]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -52,8 +52,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -65,10 +65,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_file_icons_2_same_grouped.c b/src/bin/widgets_file_icons_2_same_grouped.c
index f5e8324..6197589 100644
--- a/src/bin/widgets_file_icons_2_same_grouped.c
+++ b/src/bin/widgets_file_icons_2_same_grouped.c
@@ -19,7 +19,7 @@ static int done = 0;
static Evas_Object *o_images[NUM];
static Evas_Object *o_texts[NUM];
-static const char *icons[] =
+static const char *icons[] =
{
"e.png",
};
@@ -31,23 +31,23 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 1]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 1]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 1]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_images[i]);
+ eo_do(o_images[i], evas_obj_raise());
}
done = 0;
}
@@ -56,8 +56,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -69,10 +69,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_file_icons_3.c b/src/bin/widgets_file_icons_3.c
index 72e26ab..759b84f 100644
--- a/src/bin/widgets_file_icons_3.c
+++ b/src/bin/widgets_file_icons_3.c
@@ -19,23 +19,23 @@ static int done = 0;
static Evas_Object *o_images[NUM];
static Evas_Object *o_texts[NUM];
-static const char *icons[] =
+static const char *icons[] =
{
"bug.png",
"bulb.png",
"camera.png",
"colorbox.png",
-
+
"e.png",
"error.png",
"flower.png",
"house.png",
-
+
"mushroom.png",
"pulse.png",
"typewriter.png",
"warning.png",
-
+
"watch.png"
};
@@ -46,19 +46,19 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 13]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 13]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -67,8 +67,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -80,10 +80,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_file_icons_4.c b/src/bin/widgets_file_icons_4.c
index 9955dca..3d0ad79 100644
--- a/src/bin/widgets_file_icons_4.c
+++ b/src/bin/widgets_file_icons_4.c
@@ -19,23 +19,23 @@ static int done = 0;
static Evas_Object *o_images[NUM];
static Evas_Object *o_texts[NUM];
-static const char *icons[] =
+static const char *icons[] =
{
"bug.png",
"bulb.png",
"camera.png",
"colorbox.png",
-
+
"e.png",
"error.png",
"flower.png",
"house.png",
-
+
"mushroom.png",
"pulse.png",
"typewriter.png",
"warning.png",
-
+
"watch.png"
};
@@ -46,19 +46,19 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_image_fill_set(o, 0, 0, ICON_SIZE, ICON_SIZE);
- evas_object_resize(o, ICON_SIZE, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
+ evas_obj_size_set(ICON_SIZE, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, icons[i % 13]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(icons[i % 13]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -67,8 +67,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -80,10 +80,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x + 8, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x + 8, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE + 16 - tw) / 2;
- evas_object_move(o_texts[i], x + cent, y + ICON_SIZE + 4);
+ eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4));
x += ICON_SIZE + 16;
if (x > win_w)
{
diff --git a/src/bin/widgets_list_1.c b/src/bin/widgets_list_1.c
index 98a6296..d5eb231 100644
--- a/src/bin/widgets_list_1.c
+++ b/src/bin/widgets_list_1.c
@@ -62,19 +62,20 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -83,8 +84,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -96,10 +97,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_1_grouped.c b/src/bin/widgets_list_1_grouped.c
index 8117dbd..7c3e10e 100644
--- a/src/bin/widgets_list_1_grouped.c
+++ b/src/bin/widgets_list_1_grouped.c
@@ -62,27 +62,28 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_images[i]);
+ eo_do(o_images[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_texts[i]);
+ eo_do(o_texts[i], evas_obj_raise());
}
done = 0;
}
@@ -91,8 +92,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -104,10 +105,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_2.c b/src/bin/widgets_list_2.c
index 4cd84e5..2726848 100644
--- a/src/bin/widgets_list_2.c
+++ b/src/bin/widgets_list_2.c
@@ -62,19 +62,20 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -83,8 +84,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -96,10 +97,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_2_grouped.c b/src/bin/widgets_list_2_grouped.c
index ed3f0a0..4295721 100644
--- a/src/bin/widgets_list_2_grouped.c
+++ b/src/bin/widgets_list_2_grouped.c
@@ -62,27 +62,28 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_images[i]);
+ eo_do(o_images[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_texts[i]);
+ eo_do(o_texts[i], evas_obj_raise());
}
done = 0;
}
@@ -91,8 +92,8 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -104,10 +105,10 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_3.c b/src/bin/widgets_list_3.c
index bc75d8f..2e602c0 100644
--- a/src/bin/widgets_list_3.c
+++ b/src/bin/widgets_list_3.c
@@ -83,26 +83,28 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_image_filled_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -111,9 +113,9 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -125,11 +127,11 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_icons[i], x + 4, y + 4);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_3_grouped.c b/src/bin/widgets_list_3_grouped.c
index 82ad974..ff02da7 100644
--- a/src/bin/widgets_list_3_grouped.c
+++ b/src/bin/widgets_list_3_grouped.c
@@ -83,42 +83,44 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
- o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_image_filled_add(evas);
- o_icons[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_images[i] = o;
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
+ o_icons[i] = o;
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_images[i]);
+ eo_do(o_images[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_icons[i]);
+ eo_do(o_icons[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- if (i > 13) evas_object_stack_above(o_icons[i], o_icons[i - 13]);
+ if (i > 13) eo_do(o_icons[i], evas_obj_stack_above(o_icons[i - 13]));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_texts[i]);
+ eo_do(o_texts[i], evas_obj_raise());
}
done = 0;
}
@@ -127,9 +129,9 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -141,11 +143,11 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_icons[i], x + 4, y + 4);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_4.c b/src/bin/widgets_list_4.c
index ca30a93..e5f1faf 100644
--- a/src/bin/widgets_list_4.c
+++ b/src/bin/widgets_list_4.c
@@ -83,26 +83,28 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
-
- o = evas_object_image_filled_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
- evas_object_show(o);
-
- o = evas_object_text_add(evas);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
+ evas_obj_visibility_set(EINA_TRUE));
+
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
done = 0;
}
@@ -111,9 +113,9 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -125,11 +127,11 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_icons[i], x + 4, y + 4);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);
diff --git a/src/bin/widgets_list_4_grouped.c b/src/bin/widgets_list_4_grouped.c
index 42108a4..5716afc 100644
--- a/src/bin/widgets_list_4_grouped.c
+++ b/src/bin/widgets_list_4_grouped.c
@@ -83,42 +83,44 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < NUM; i++)
{
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path("pan.png"), NULL);
- evas_object_resize(o, win_w, ICON_SIZE);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path("pan.png"), NULL),
+ evas_obj_size_set(win_w, ICON_SIZE),
+ evas_obj_visibility_set(EINA_TRUE));
- o = evas_object_image_filled_add(evas);
+ o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_icons[i] = o;
- evas_object_image_border_set(o, 2, 2, 2, 2);
- evas_object_image_file_set(o, build_path(icons[i % 13]), NULL);
- evas_object_resize(o, ICON_SIZE - 8, ICON_SIZE - 8);
- evas_object_show(o);
+ eo_do(o, evas_obj_image_filled_set(1),
+ evas_obj_image_border_set(2, 2, 2, 2),
+ evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
+ evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
+ evas_obj_visibility_set(EINA_TRUE));
- o = evas_object_text_add(evas);
+ o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
- evas_object_text_font_set(o, "Vera-Bold", 10);
- evas_object_text_text_set(o, labels[i % 26]);
- evas_object_color_set(o, 0, 0, 0, 255);
- evas_object_show(o);
+ eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
+ evas_obj_text_text_set(labels[i % 26]),
+ evas_obj_color_set(0, 0, 0, 255),
+ evas_obj_visibility_set(EINA_TRUE));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_images[i]);
+ eo_do(o_images[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_icons[i]);
+ eo_do(o_icons[i], evas_obj_raise());
}
for (i = 0; i < NUM; i++)
{
- if (i > 13) evas_object_stack_above(o_icons[i], o_icons[i - 13]);
+ if (i > 13) eo_do(o_icons[i], evas_obj_stack_above(o_icons[i - 13]));
}
for (i = 0; i < NUM; i++)
{
- evas_object_raise(o_texts[i]);
+ eo_do(o_texts[i], evas_obj_raise());
}
done = 0;
}
@@ -127,9 +129,9 @@ static void _setup(void)
static void _cleanup(void)
{
int i;
- for (i = 0; i < NUM; i++) evas_object_del(o_images[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_icons[i]);
- for (i = 0; i < NUM; i++) evas_object_del(o_texts[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_images[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_icons[i]);
+ for (i = 0; i < NUM; i++) eo_del(o_texts[i]);
}
/* loop - do things */
@@ -141,11 +143,11 @@ static void _loop(double t, int f)
y = 0 - f;
for (i = 0; i < NUM; i++)
{
- evas_object_move(o_images[i], x, y);
- evas_object_move(o_icons[i], x + 4, y + 4);
- evas_object_geometry_get(o_texts[i], NULL, NULL, &tw, &th);
+ eo_do(o_images[i], evas_obj_position_set(x, y));
+ eo_do(o_icons[i], evas_obj_position_set(x + 4, y + 4));
+ eo_do(o_texts[i], evas_obj_size_get(&tw, &th));
cent = (ICON_SIZE - th) / 2;
- evas_object_move(o_texts[i], x + 8 + ICON_SIZE + 8, y + cent);
+ eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent));
y += ICON_SIZE;
}
FPS_STD(NAME);