diff --git a/src/bin/about.c b/src/bin/about.c index 10f6949..19eb272 100644 --- a/src/bin/about.c +++ b/src/bin/about.c @@ -9,9 +9,9 @@ _setup(void) Evas_Textblock_Style *st; o = eo_add(EVAS_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)); + eo_do(o, efl_gfx_position_set(10, 40), + efl_gfx_size_set(win_w - 20, win_h - 50), + efl_gfx_visible_set(EINA_TRUE)); st = evas_textblock_style_new(); evas_textblock_style_set (st, diff --git a/src/bin/image_blend_border.c b/src/bin/image_blend_border.c index 4cc7de8..27534a1 100644 --- a/src/bin/image_blend_border.c +++ b/src/bin/image_blend_border.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("bar.png"), NULL), evas_obj_image_border_set(6, 6, 6, 6), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 f8a7863..54336cb 100644 --- a/src/bin/image_blend_border_recolor.c +++ b/src/bin/image_blend_border_recolor.c @@ -27,9 +27,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("pan.png"), NULL), - evas_obj_color_set(64, 64, 64, 255), + efl_gfx_color_set(64, 64, 64, 255), evas_obj_image_border_set(3, 3, 3, 3), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -57,9 +57,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 ddfae29..2a5fe82 100644 --- a/src/bin/image_blend_fade_pow2_unscaled.c +++ b/src/bin/image_blend_fade_pow2_unscaled.c @@ -29,13 +29,13 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160)); a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; eo_do(o, - evas_obj_color_set(a, a, a, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(a, a, a, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 a6a476a..a96cdb8 100644 --- a/src/bin/image_blend_fade_unscaled.c +++ b/src/bin/image_blend_fade_unscaled.c @@ -29,10 +29,10 @@ static void _setup(void) a = rnd()&0xff; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), - evas_obj_color_set(a, a, a, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_color_set(a, a, a, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_blend_many_smooth_same_scaled.c b/src/bin/image_blend_many_smooth_same_scaled.c index 571c388..3e1a6e4 100644 --- a/src/bin/image_blend_many_smooth_same_scaled.c +++ b/src/bin/image_blend_many_smooth_same_scaled.c @@ -33,9 +33,9 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), - evas_obj_size_set(w, h), - evas_obj_image_fill_set(0, 0, w, h), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -54,12 +54,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < MANYNUM; i++) { - eo_do(o_images[i], evas_obj_size_get(&w, &h)); + eo_do(o_images[i], efl_gfx_size_get(&w, &h)); x = (win_w / 2) - (w / 2); x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (win_w / 2); y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (win_h / 2); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 c70f20b..4db67f2 100644 --- a/src/bin/image_blend_nearest_same_scaled.c +++ b/src/bin/image_blend_nearest_same_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 95ce610..cf78b4a 100644 --- a/src/bin/image_blend_nearest_scaled.c +++ b/src/bin/image_blend_nearest_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 b979feb..afbc2aa 100644 --- a/src/bin/image_blend_nearest_solid_same_scaled.c +++ b/src/bin/image_blend_nearest_solid_same_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 41c8f35..87912a2 100644 --- a/src/bin/image_blend_nearest_solid_scaled.c +++ b/src/bin/image_blend_nearest_solid_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 3510450..a1b4032 100644 --- a/src/bin/image_blend_occlude1.c +++ b/src/bin/image_blend_occlude1.c @@ -38,12 +38,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -70,7 +70,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 a454eff..97aad3b 100644 --- a/src/bin/image_blend_occlude1_few.c +++ b/src/bin/image_blend_occlude1_few.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(PACKAGE_DATA_DIR"/data/image.png", NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 9beef4e..a876067 100644 --- a/src/bin/image_blend_occlude1_many.c +++ b/src/bin/image_blend_occlude1_many.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 b918d54..3a97476 100644 --- a/src/bin/image_blend_occlude1_very_many.c +++ b/src/bin/image_blend_occlude1_very_many.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/image_blend_occlude2.c b/src/bin/image_blend_occlude2.c index 5f0f425..70fc10e 100644 --- a/src/bin/image_blend_occlude2.c +++ b/src/bin/image_blend_occlude2.c @@ -38,12 +38,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -70,7 +70,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 1699edd..1de6e1e 100644 --- a/src/bin/image_blend_occlude2_few.c +++ b/src/bin/image_blend_occlude2_few.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 264ebe7..cf9bea0 100644 --- a/src/bin/image_blend_occlude2_many.c +++ b/src/bin/image_blend_occlude2_many.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 7306698..e3ec9eb 100644 --- a/src/bin/image_blend_occlude2_very_many.c +++ b/src/bin/image_blend_occlude2_very_many.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } } FPS_STD(NAME); diff --git a/src/bin/image_blend_occlude3.c b/src/bin/image_blend_occlude3.c index f083a7b..0e80e66 100644 --- a/src/bin/image_blend_occlude3.c +++ b/src/bin/image_blend_occlude3.c @@ -38,12 +38,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -70,7 +70,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 076fd0b..ff4aab0 100644 --- a/src/bin/image_blend_occlude3_few.c +++ b/src/bin/image_blend_occlude3_few.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 1e34dbc..a126ee7 100644 --- a/src/bin/image_blend_occlude3_many.c +++ b/src/bin/image_blend_occlude3_many.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 4cce7f8..de06622 100644 --- a/src/bin/image_blend_occlude3_very_many.c +++ b/src/bin/image_blend_occlude3_very_many.c @@ -41,12 +41,12 @@ static void _setup(void) y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_position_set(x, y)); + efl_gfx_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -73,7 +73,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 ac28e68..4f3090b 100644 --- a/src/bin/image_blend_smooth_same_scaled.c +++ b/src/bin/image_blend_smooth_same_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 b96b911..b0fafef 100644 --- a/src/bin/image_blend_smooth_scaled.c +++ b/src/bin/image_blend_smooth_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("logo.png"), NULL), efl_image_smooth_scale_set(1), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 783a648..a62e6fd 100644 --- a/src/bin/image_blend_smooth_solid_same_scaled.c +++ b/src/bin/image_blend_smooth_solid_same_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(1), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 654995f..d9f9418 100644 --- a/src/bin/image_blend_smooth_solid_scaled.c +++ b/src/bin/image_blend_smooth_solid_scaled.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("image.png"), NULL), efl_image_smooth_scale_set(1), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 69cf05c..eaec1c7 100644 --- a/src/bin/image_blend_solid_border.c +++ b/src/bin/image_blend_solid_border.c @@ -28,7 +28,7 @@ static void _setup(void) eo_do(o, efl_file_set(build_path("frame.png"), NULL), evas_obj_image_border_set(8, 8, 8, 8), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,9 +56,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 8215814..20a39b9 100644 --- a/src/bin/image_blend_solid_fade_pow2_unscaled.c +++ b/src/bin/image_blend_solid_fade_pow2_unscaled.c @@ -29,13 +29,13 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160)); a = 256 - (1 << ((rnd() % 8) + 1)); if (a < 128) a = 128; eo_do(o, - evas_obj_color_set(a, a, a, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(a, a, a, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 1815177..eab9455 100644 --- a/src/bin/image_blend_solid_fade_unscaled.c +++ b/src/bin/image_blend_solid_fade_unscaled.c @@ -29,12 +29,12 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160)); a = rnd()&0xff; eo_do(o, - evas_obj_color_set(a, a, a, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(a, a, a, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 c7fe4da..7c38815 100644 --- a/src/bin/image_blend_solid_middle_border.c +++ b/src/bin/image_blend_solid_middle_border.c @@ -29,7 +29,7 @@ static void _setup(void) efl_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)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -57,9 +57,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 2e5fa59..631f013 100644 --- a/src/bin/image_blend_solid_middle_unscaled.c +++ b/src/bin/image_blend_solid_middle_unscaled.c @@ -27,11 +27,11 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_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)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -56,7 +56,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_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 73f3b00..0efbbb7 100644 --- a/src/bin/image_blend_solid_unscaled.c +++ b/src/bin/image_blend_solid_unscaled.c @@ -27,9 +27,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -54,7 +54,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_blend_unscaled.c b/src/bin/image_blend_unscaled.c index f12974e..27c82bd 100644 --- a/src/bin/image_blend_unscaled.c +++ b/src/bin/image_blend_unscaled.c @@ -27,9 +27,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -54,7 +54,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_crossfade.c b/src/bin/image_crossfade.c index 2159cb1..98a9da3 100644 --- a/src/bin/image_crossfade.c +++ b/src/bin/image_crossfade.c @@ -26,17 +26,17 @@ static void _setup(void) o_images[0] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[1] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_visible_set(EINA_TRUE)); done = 0; } @@ -55,7 +55,7 @@ static void _loop(double t, int f) a = f & 0x1f; a = ((a << 3) | (a >> 2)) & 0xff; - eo_do(o_images[1], evas_obj_color_set(a, a, a, a)); + eo_do(o_images[1], efl_gfx_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 d868867..47d74a1 100644 --- a/src/bin/image_data_argb.c +++ b/src/bin/image_data_argb.c @@ -29,11 +29,11 @@ static void _setup(void) 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), + efl_gfx_view_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)); + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -59,9 +59,9 @@ static void _loop(double t, int f) 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), + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h), data = evas_obj_image_data_get(1), st = evas_obj_image_stride_get()); st = st >> 2; diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c index 541eb1b..d20e9f9 100644 --- a/src/bin/image_data_argb_alpha.c +++ b/src/bin/image_data_argb_alpha.c @@ -29,11 +29,11 @@ static void _setup(void) 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), + efl_gfx_view_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)); + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -59,9 +59,9 @@ static void _loop(double t, int f) 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), + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h), data = evas_obj_image_data_get(1), st = evas_obj_image_stride_get()); st = st >> 2; diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c index d06689a..4318162 100644 --- a/src/bin/image_data_ycbcr601pl.c +++ b/src/bin/image_data_ycbcr601pl.c @@ -32,11 +32,11 @@ static void _setup(void) 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), + efl_gfx_view_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)); + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), + efl_gfx_visible_set(EINA_TRUE)); yp = malloc(640 * 480); up = malloc(320 * 240); vp = malloc(320 * 240); @@ -92,9 +92,9 @@ static void _loop(double t, int f) 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), + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 2800955..14f4575 100644 --- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c @@ -32,12 +32,12 @@ static void _setup(void) 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), + efl_gfx_view_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), + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); yp = malloc(640 * 480); up = malloc(320 * 240); vp = malloc(320 * 240); diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c index 26a00a1..536d65d 100644 --- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c @@ -32,11 +32,11 @@ static void _setup(void) 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), + efl_gfx_view_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)); + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), + efl_gfx_visible_set(EINA_TRUE)); yp = malloc(640 * 480); up = malloc(320 * 240); vp = malloc(320 * 240); diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c index 1025622..65bf564 100644 --- a/src/bin/image_data_ycbcr601pl_wide_stride.c +++ b/src/bin/image_data_ycbcr601pl_wide_stride.c @@ -32,11 +32,11 @@ static void _setup(void) 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), + efl_gfx_view_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)); + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), + efl_gfx_visible_set(EINA_TRUE)); yp = malloc(640 * 480); up = malloc(320 * 240); vp = malloc(320 * 240); @@ -99,9 +99,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h)); w = 320 - 16 + f; if (w < 1) w = 1; @@ -109,7 +109,7 @@ static void _loop(double t, int f) w &= ~0x1; - eo_do(o_images[i], evas_obj_image_size_set(w, 480)); + eo_do(o_images[i], efl_gfx_view_size_set(w, 480)); data = evas_object_image_data_get(o_images[i], 1); if (data) { diff --git a/src/bin/image_map_3d_1.c b/src/bin/image_map_3d_1.c index 803e4b1..569885e 100644 --- a/src/bin/image_map_3d_1.c +++ b/src/bin/image_map_3d_1.c @@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) snprintf(buf, sizeof(buf), "cube%i.png", i + 1); eo_do(o, efl_file_set(build_path(buf), NULL), - evas_obj_image_fill_set(0, 0, 256, 256), - evas_obj_size_set(256, 256), + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 256, 0); @@ -134,11 +134,11 @@ _cube_pos(Cube *c, eo_do(c->side[i].o, evas_obj_map_enable_set(1), evas_obj_map_set(m), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } else { - eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); + eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); } order[i] = i; @@ -163,9 +163,9 @@ _cube_pos(Cube *c, } while (!sorted); - eo_do(c->side[order[0]].o, evas_obj_raise()); + eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); for (i = 1; i < 6; i++) - eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); + eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); } static void diff --git a/src/bin/image_map_3d_2.c b/src/bin/image_map_3d_2.c index 29e2229..4a1a80c 100644 --- a/src/bin/image_map_3d_2.c +++ b/src/bin/image_map_3d_2.c @@ -59,9 +59,9 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) snprintf(buf, sizeof(buf), "cube%i.png", i + 1); eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), + efl_gfx_visible_set(EINA_TRUE)); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 256, 0); @@ -132,11 +132,11 @@ _cube_pos(Cube *c, eo_do(c->side[i].o, evas_obj_map_enable_set(1), evas_obj_map_set(m), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } else { - eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); + eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); } order[i] = i; @@ -161,9 +161,9 @@ _cube_pos(Cube *c, } while (!sorted); - eo_do(c->side[order[0]].o, evas_obj_raise()); + eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); for (i = 1; i < 6; i++) - eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); + eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); } static void diff --git a/src/bin/image_map_3d_3.c b/src/bin/image_map_3d_3.c index 4b2d471..f0d7d77 100644 --- a/src/bin/image_map_3d_3.c +++ b/src/bin/image_map_3d_3.c @@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) snprintf(buf, sizeof(buf), "cube%i.png", i + 1); eo_do(o, efl_file_set(build_path(buf), NULL), - evas_obj_image_fill_set(0, 0, 256, 256), - evas_obj_size_set(256, 256), + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 256, 0); @@ -155,9 +155,9 @@ _cube_pos(Cube *c, } while (!sorted); - eo_do(c->side[order[0]].o, evas_obj_raise()); + eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); for (i = 1; i < 6; i++) - eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); + eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); } static void diff --git a/src/bin/image_map_3d_4.c b/src/bin/image_map_3d_4.c index 323d35f..7d2cd0c 100644 --- a/src/bin/image_map_3d_4.c +++ b/src/bin/image_map_3d_4.c @@ -59,9 +59,9 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) snprintf(buf, sizeof(buf), "cube%i.png", i + 1); eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), + efl_gfx_visible_set(EINA_TRUE)); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 256, 0); @@ -153,9 +153,9 @@ _cube_pos(Cube *c, } while (!sorted); - eo_do(c->side[order[0]].o, evas_obj_raise()); + eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); for (i = 1; i < 6; i++) - eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); + eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); } static void diff --git a/src/bin/image_map_3d_5.c b/src/bin/image_map_3d_5.c index cb1f5f6..5090a83 100644 --- a/src/bin/image_map_3d_5.c +++ b/src/bin/image_map_3d_5.c @@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); eo_do(o, efl_file_set(build_path(buf), NULL), - evas_obj_image_fill_set(0, 0, 720, 420), - evas_obj_size_set(720, 420), + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 720, 0); @@ -134,11 +134,11 @@ _cube_pos(Cube *c, eo_do(c->side[i].o, evas_obj_map_enable_set(1), evas_obj_map_set(m), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } else { - eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); + eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); } order[i] = i; @@ -163,9 +163,9 @@ _cube_pos(Cube *c, } while (!sorted); - eo_do(c->side[order[0]].o, evas_obj_raise()); + eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); for (i = 1; i < 6; i++) - eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); + eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); } static void diff --git a/src/bin/image_map_3d_6.c b/src/bin/image_map_3d_6.c index 8954c02..e38b157 100644 --- a/src/bin/image_map_3d_6.c +++ b/src/bin/image_map_3d_6.c @@ -59,10 +59,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d) snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); eo_do(o, efl_file_set(build_path(buf), NULL), - evas_obj_image_fill_set(0, 0, 720, 420), - evas_obj_size_set(720, 420), + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } POINT(0, 0, -w, -h, -d, 0, 0); POINT(0, 1, w, -h, -d, 720, 0); @@ -131,11 +131,11 @@ _cube_pos(Cube *c, eo_do(c->side[i].o, evas_obj_map_enable_set(1), evas_obj_map_set(m), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } else { - eo_do(c->side[i].o, evas_obj_visibility_set(EINA_FALSE)); + eo_do(c->side[i].o, efl_gfx_visible_set(EINA_FALSE)); } order[i] = i; @@ -160,9 +160,9 @@ _cube_pos(Cube *c, } while (!sorted); - eo_do(c->side[order[0]].o, evas_obj_raise()); + eo_do(c->side[order[0]].o, efl_gfx_stack_raise()); for (i = 1; i < 6; i++) - eo_do(c->side[order[i]].o, evas_obj_stack_below(c->side[order[i - 1]].o)); + eo_do(c->side[order[i]].o, efl_gfx_stack_below(c->side[order[i - 1]].o)); } static void diff --git a/src/bin/image_map_3d_flow.c b/src/bin/image_map_3d_flow.c index f2cdf7a..f380e7f 100644 --- a/src/bin/image_map_3d_flow.c +++ b/src/bin/image_map_3d_flow.c @@ -34,20 +34,20 @@ static void _setup(void) snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); eo_do(o, efl_file_set(build_path(buf), NULL), - evas_obj_image_fill_set(0, 0, 256, 256), - evas_obj_size_set(256, 256), + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_IMAGE_CLASS, evas); o_reflec[i] = o; snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); eo_do(o, efl_file_set(build_path(buf), NULL), - evas_obj_image_fill_set(0, 0, 256, 256), - evas_obj_size_set(256, 256), + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -130,13 +130,13 @@ static void _loop(double t, int f) if (c <= 0) { - eo_do(o_images[i], evas_obj_raise()); - eo_do(o_reflec[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); + eo_do(o_reflec[i], efl_gfx_stack_raise()); } else { - eo_do(o_images[i], evas_obj_lower()); - eo_do(o_reflec[i], evas_obj_lower()); + eo_do(o_images[i], efl_gfx_stack_lower()); + eo_do(o_reflec[i], efl_gfx_stack_lower()); } evas_map_point_coord_set (m, 0, x, y, -z); diff --git a/src/bin/image_map_color_alpha_nearest_rotate.c b/src/bin/image_map_color_alpha_nearest_rotate.c index a27addd..55601b3 100644 --- a/src/bin/image_map_color_alpha_nearest_rotate.c +++ b/src/bin/image_map_color_alpha_nearest_rotate.c @@ -28,10 +28,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } 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 1f8f27b..289c027 100644 --- a/src/bin/image_map_color_alpha_nearest_solid_rotate.c +++ b/src/bin/image_map_color_alpha_nearest_solid_rotate.c @@ -28,10 +28,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_color_alpha_rotate.c b/src/bin/image_map_color_alpha_rotate.c index 40d1f49..bec6b37 100644 --- a/src/bin/image_map_color_alpha_rotate.c +++ b/src/bin/image_map_color_alpha_rotate.c @@ -28,9 +28,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_color_alpha_solid_rotate.c b/src/bin/image_map_color_alpha_solid_rotate.c index 7552048..6decf13 100644 --- a/src/bin/image_map_color_alpha_solid_rotate.c +++ b/src/bin/image_map_color_alpha_solid_rotate.c @@ -28,9 +28,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_color_nearest_rotate.c b/src/bin/image_map_color_nearest_rotate.c index c09ae09..0c6297c 100644 --- a/src/bin/image_map_color_nearest_rotate.c +++ b/src/bin/image_map_color_nearest_rotate.c @@ -28,10 +28,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_color_nearest_solid_rotate.c b/src/bin/image_map_color_nearest_solid_rotate.c index e7fcf7c..a412ac9 100644 --- a/src/bin/image_map_color_nearest_solid_rotate.c +++ b/src/bin/image_map_color_nearest_solid_rotate.c @@ -28,10 +28,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_color_rotate.c b/src/bin/image_map_color_rotate.c index 7f4969a..3d33ef9 100644 --- a/src/bin/image_map_color_rotate.c +++ b/src/bin/image_map_color_rotate.c @@ -28,9 +28,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_color_solid_rotate.c b/src/bin/image_map_color_solid_rotate.c index 8040da3..02f93b3 100644 --- a/src/bin/image_map_color_solid_rotate.c +++ b/src/bin/image_map_color_solid_rotate.c @@ -28,9 +28,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_nearest_rotate.c b/src/bin/image_map_nearest_rotate.c index 7c98d1f..e412145 100644 --- a/src/bin/image_map_nearest_rotate.c +++ b/src/bin/image_map_nearest_rotate.c @@ -28,10 +28,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_nearest_solid_rotate.c b/src/bin/image_map_nearest_solid_rotate.c index 0a37dd4..3a1c62a 100644 --- a/src/bin/image_map_nearest_solid_rotate.c +++ b/src/bin/image_map_nearest_solid_rotate.c @@ -28,10 +28,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("image.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_rotate.c b/src/bin/image_map_rotate.c index 58cad97..28bcb0b 100644 --- a/src/bin/image_map_rotate.c +++ b/src/bin/image_map_rotate.c @@ -27,9 +27,9 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_map_solid_rotate.c b/src/bin/image_map_solid_rotate.c index 104dd4d..cd8f372 100644 --- a/src/bin/image_map_solid_rotate.c +++ b/src/bin/image_map_solid_rotate.c @@ -28,9 +28,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_mask.c b/src/bin/image_mask.c index e3ccd38..94caae4 100644 --- a/src/bin/image_mask.c +++ b/src/bin/image_mask.c @@ -27,17 +27,17 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_IMAGE_CLASS,evas); o_images[i + 1] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); eo_do(o_images[i], evas_obj_clip_set(o)); } @@ -64,8 +64,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_images[i + 1], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_images[i + 1], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_10.c b/src/bin/image_mask_10.c index d759d45..793bea2 100644 --- a/src/bin/image_mask_10.c +++ b/src/bin/image_mask_10.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < 1; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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), + efl_gfx_fill_set(0, 0, win_w * 4, win_h * 4), + efl_gfx_size_set(win_w * 4, win_h * 4), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/image_mask_11.c b/src/bin/image_mask_11.c index df34620..d7e52ea 100644 --- a/src/bin/image_mask_11.c +++ b/src/bin/image_mask_11.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -68,7 +68,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } if (!m) m = evas_map_new(4); evas_map_util_points_populate_from_geometry(m, diff --git a/src/bin/image_mask_12.c b/src/bin/image_mask_12.c index b19b404..32a0e1a 100644 --- a/src/bin/image_mask_12.c +++ b/src/bin/image_mask_12.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,11 +38,11 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(1), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -72,9 +72,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_13.c b/src/bin/image_mask_13.c index 88240bb..d7ec341 100644 --- a/src/bin/image_mask_13.c +++ b/src/bin/image_mask_13.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,11 +38,11 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), efl_image_smooth_scale_set(0), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -72,9 +72,9 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_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 7c4b34f..b3ef3a5 100644 --- a/src/bin/image_mask_2.c +++ b/src/bin/image_mask_2.c @@ -27,17 +27,17 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_IMAGE_CLASS,evas); o_images[i + 1] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); eo_do(o_images[i], evas_obj_clip_set(o)); } @@ -64,8 +64,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_images[i + 1], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_images[i + 1], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_3.c b/src/bin/image_mask_3.c index 7d3e72d..6274a18 100644 --- a/src/bin/image_mask_3.c +++ b/src/bin/image_mask_3.c @@ -27,17 +27,17 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_IMAGE_CLASS,evas); o_images[i + 1] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); eo_do(o_images[i], evas_obj_clip_set(o)); } @@ -64,8 +64,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_images[i + 1], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_images[i + 1], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_4.c b/src/bin/image_mask_4.c index e342170..e8fc66b 100644 --- a/src/bin/image_mask_4.c +++ b/src/bin/image_mask_4.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -67,7 +67,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_5.c b/src/bin/image_mask_5.c index 4499252..2ca680e 100644 --- a/src/bin/image_mask_5.c +++ b/src/bin/image_mask_5.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -67,7 +67,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_6.c b/src/bin/image_mask_6.c index e2cf72f..4db7699 100644 --- a/src/bin/image_mask_6.c +++ b/src/bin/image_mask_6.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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), + efl_gfx_fill_set(0, 0, 120 / 2, 160 / 2), + efl_gfx_size_set(120 / 2, 160 / 2), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -67,7 +67,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_7.c b/src/bin/image_mask_7.c index e75eeaa..58ee03b 100644 --- a/src/bin/image_mask_7.c +++ b/src/bin/image_mask_7.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_position_set((win_w - 120) / 2, (win_h - 160) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < OBNUM; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_file_set(build_path("logo.png"), NULL), - evas_obj_image_fill_set(0, 0, 120, 160), - evas_obj_size_set(120, 160), + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -67,14 +67,14 @@ 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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } w = 10 + (110 + (110 * sin((double)(f) / (14.3 * SLOW)))); h = 10 + (150 + (150 * sin((double)(f) / (21.7 * SLOW)))); 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)); + efl_gfx_fill_set(0, 0, w, h), + efl_gfx_size_set(w, h), + efl_gfx_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 d616496..a9adc86 100644 --- a/src/bin/image_mask_8.c +++ b/src/bin/image_mask_8.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < 1; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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), + efl_gfx_fill_set(0, 0, 500, 444), + efl_gfx_size_set(win_w * 4, win_h * 4), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -67,7 +67,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/image_mask_9.c b/src/bin/image_mask_9.c index e50be76..8bc63e1 100644 --- a/src/bin/image_mask_9.c +++ b/src/bin/image_mask_9.c @@ -27,10 +27,10 @@ static void _setup(void) o_mask = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 720, 420), + efl_gfx_size_set(720, 420), + efl_gfx_position_set((win_w - 720) / 2, (win_h - 420) / 2), + efl_gfx_visible_set(EINA_TRUE)); for (i = 0; i < 1; i++) { @@ -38,10 +38,10 @@ static void _setup(void) o_images[i] = o; eo_do(o, efl_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), + efl_gfx_fill_set(0, 0, 500, 444), + efl_gfx_size_set(win_w * 4, win_h * 4), evas_obj_clip_set(o_mask), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -68,7 +68,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } if (!m) m = evas_map_new(4); diff --git a/src/bin/image_quality_scale.c b/src/bin/image_quality_scale.c index 9f9b775..039bb20 100644 --- a/src/bin/image_quality_scale.c +++ b/src/bin/image_quality_scale.c @@ -27,9 +27,9 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 640, 480), + efl_gfx_size_set(640, 480), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - 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)); + eo_do(o_images[i], efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h)); } FPS_STD(NAME); } diff --git a/src/bin/line_blend.c b/src/bin/line_blend.c index 9ee5e18..5ccc566 100644 --- a/src/bin/line_blend.c +++ b/src/bin/line_blend.c @@ -33,12 +33,12 @@ static void _setup(void) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; eo_do(o, - evas_obj_color_set(r, g, b, a), + efl_gfx_color_set(r, g, b, a), evas_obj_line_xy_set(((win_w / 2) * (rnd()&0xff)) / 255, ((win_h / 2) * (rnd()&0xff)) / 255, ((win_w / 2) * (rnd()&0xff)) / 255 + (win_w / 2), ((win_h / 2) * (rnd()&0xff)) / 255 + (win_h / 2)), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } diff --git a/src/bin/poly_blend.c b/src/bin/poly_blend.c index 5aa8340..1ea46c2 100644 --- a/src/bin/poly_blend.c +++ b/src/bin/poly_blend.c @@ -80,8 +80,8 @@ static void _setup(void) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; if (o) - eo_do(o, evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); poly(o, i, 0, 0); } done = 0; @@ -105,13 +105,13 @@ static void _loop(double t, int f) { o = o_images[i]; if (o) - eo_do(o, evas_obj_size_get(&w, &h)); + eo_do(o, efl_gfx_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); if (o) - eo_do(o, evas_obj_position_set(x, y)); + eo_do(o, efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/proxy_image.c b/src/bin/proxy_image.c index a768c50..b520a11 100644 --- a/src/bin/proxy_image.c +++ b/src/bin/proxy_image.c @@ -25,9 +25,9 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_visible_set(EINA_TRUE)); src = o; o_images[0] = src; @@ -37,9 +37,9 @@ static void _setup(void) o_images[i] = o; eo_do(o, evas_obj_image_source_set(src), - evas_obj_size_set(120, 160), - evas_obj_image_fill_set(0,0,120,160), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(120, 160), + efl_gfx_fill_set(0,0,120,160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -64,7 +64,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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/proxy_image_offscreen.c b/src/bin/proxy_image_offscreen.c index 45b4f2c..8cfe51c 100644 --- a/src/bin/proxy_image_offscreen.c +++ b/src/bin/proxy_image_offscreen.c @@ -28,9 +28,9 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_position_set(-400, -300)); src = o; for (i = 0; i < OBNUM / 2; i++) @@ -38,9 +38,9 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = 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)); + efl_gfx_size_set(120, 160), + efl_gfx_fill_set(0,0,120,160), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/proxy_text_fixed.c b/src/bin/proxy_text_fixed.c index 8443e4b..b391a0a 100644 --- a/src/bin/proxy_text_fixed.c +++ b/src/bin/proxy_text_fixed.c @@ -33,12 +33,12 @@ static void _setup(void) efl_text_properties_font_set("Vera-Bold", 20), efl_text_set("This is a test string"), evas_obj_text_style_set(st), - evas_obj_color_set(255, 255, 255, 255), + efl_gfx_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)); + efl_gfx_visible_set(EINA_TRUE)); st++; } st = i; @@ -50,11 +50,11 @@ static void _setup(void) o_texts[i] = o; eo_do(o, evas_obj_image_source_set(s)); /* FIXME s == NULL*/ - eo_do(s, evas_obj_size_get(&w, &h)); + eo_do(s, efl_gfx_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)); + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; @@ -74,12 +74,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - eo_do(o_texts[i], evas_obj_size_get(&w, &h)); + eo_do(o_texts[i], efl_gfx_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); - eo_do(o_texts[i], evas_obj_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/proxy_text_random.c b/src/bin/proxy_text_random.c index 81105f5..f2f2670 100644 --- a/src/bin/proxy_text_random.c +++ b/src/bin/proxy_text_random.c @@ -41,30 +41,30 @@ static void _setup(void) eo_do(o, efl_text_properties_font_set("Vera-Bold", 20), efl_text_set(buf), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_size_get(&w, &h)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_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); eo_do(o, - evas_obj_position_set(x, y), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_position_set(x, y), + efl_gfx_visible_set(EINA_TRUE)); for (i = 1 ; i < OBNUM ; i ++) { o = eo_add(EVAS_IMAGE_CLASS, evas); o_texts[i] = o; eo_do(o, evas_obj_image_source_set(o_texts[0])); - 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)); + eo_do(o_texts[0], efl_gfx_size_get(&w, &h)); + eo_do(o, efl_gfx_size_set(w, h), + efl_gfx_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); - eo_do(o, evas_obj_position_set(x, y), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_position_set(x, y), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; @@ -94,12 +94,12 @@ static void _loop(double t, int f) strs[rnd() % (sizeof(strs) / sizeof(char *))]); eo_do(o_texts[0], efl_text_set(buf), - evas_obj_size_get(&w, &h)); + efl_gfx_size_get(&w, &h)); for (i = 1; i < OBNUM; i++) { eo_do(o_texts[i], - evas_obj_size_set(w,h), - evas_obj_image_fill_set(0,0,w,h)); + efl_gfx_size_set(w,h), + efl_gfx_fill_set(0,0,w,h)); } FPS_STD(NAME); } diff --git a/src/bin/rect_blend.c b/src/bin/rect_blend.c index 2a24694..40a1538 100644 --- a/src/bin/rect_blend.c +++ b/src/bin/rect_blend.c @@ -33,8 +33,8 @@ static void _setup(void) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; eo_do(o, - evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -62,8 +62,8 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); } FPS_STD(NAME); } diff --git a/src/bin/rect_blend_few.c b/src/bin/rect_blend_few.c index 15985b4..63e7adb 100644 --- a/src/bin/rect_blend_few.c +++ b/src/bin/rect_blend_few.c @@ -35,8 +35,8 @@ static void _setup(void) r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; - eo_do(o, evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y), - evas_obj_size_set(w, h)); + eo_do(o_images[i], efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); } FPS_STD(NAME); } diff --git a/src/bin/rect_blend_pow2.c b/src/bin/rect_blend_pow2.c index f4df639..c1d0c6e 100644 --- a/src/bin/rect_blend_pow2.c +++ b/src/bin/rect_blend_pow2.c @@ -34,8 +34,8 @@ static void _setup(void) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; eo_do(o, - evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -63,8 +63,8 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_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 465bd82..7c33a67 100644 --- a/src/bin/rect_blend_pow2_few.c +++ b/src/bin/rect_blend_pow2_few.c @@ -36,8 +36,8 @@ static void _setup(void) r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; - eo_do(o, evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y), - evas_obj_size_set(w, h)); + eo_do(o_images[i], efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); } FPS_STD(NAME); } diff --git a/src/bin/rect_solid.c b/src/bin/rect_solid.c index 071bdf4..d2d282f 100644 --- a/src/bin/rect_solid.c +++ b/src/bin/rect_solid.c @@ -33,8 +33,8 @@ static void _setup(void) g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; eo_do(o, - evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -62,8 +62,8 @@ static void _loop(double t, int f) 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)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); } FPS_STD(NAME); } diff --git a/src/bin/rect_solid_few.c b/src/bin/rect_solid_few.c index 917a96c..81aef86 100644 --- a/src/bin/rect_solid_few.c +++ b/src/bin/rect_solid_few.c @@ -35,8 +35,8 @@ static void _setup(void) r = ((rnd()&0xff) * a) / 255; g = ((rnd()&0xff) * a) / 255; b = ((rnd()&0xff) * a) / 255; - eo_do(o, evas_obj_color_set(r, g, b, a), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_color_set(r, g, b, a), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -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); - eo_do(o_images[i], evas_obj_position_set(x, y), - evas_obj_size_set(w, h)); + eo_do(o_images[i], efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); } FPS_STD(NAME); } diff --git a/src/bin/text_basic.c b/src/bin/text_basic.c index be51708..76f2ef4 100644 --- a/src/bin/text_basic.c +++ b/src/bin/text_basic.c @@ -29,8 +29,8 @@ static void _setup(void) o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 20), efl_text_set("This is a test string"), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -49,12 +49,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - eo_do(o_texts[i], evas_obj_size_get(&w, &h)); + eo_do(o_texts[i], efl_gfx_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); - eo_do(o_texts[i], evas_obj_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/text_change.c b/src/bin/text_change.c index 25db3cf..efe893b 100644 --- a/src/bin/text_change.c +++ b/src/bin/text_change.c @@ -41,14 +41,14 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))]); eo_do(o, efl_text_set(buf), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_size_get(&w, &h)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_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); - eo_do(o, evas_obj_position_set(x, y), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_position_set(x, y), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } diff --git a/src/bin/text_styles.c b/src/bin/text_styles.c index 5d5fc25..50d9f7f 100644 --- a/src/bin/text_styles.c +++ b/src/bin/text_styles.c @@ -33,12 +33,12 @@ static void _setup(void) efl_text_properties_font_set("Vera-Bold", 20), efl_text_set("This is a test string"), evas_obj_text_style_set(st), - evas_obj_color_set(255, 255, 255, 255), + efl_gfx_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)); + efl_gfx_visible_set(EINA_TRUE)); st++; if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; } @@ -59,12 +59,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - eo_do(o_texts[i], evas_obj_size_get(&w, &h)); + eo_do(o_texts[i], efl_gfx_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); - eo_do(o_texts[i], evas_obj_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_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 187c0f5..f785fbf 100644 --- a/src/bin/text_styles_different_strings.c +++ b/src/bin/text_styles_different_strings.c @@ -44,12 +44,12 @@ static void _setup(void) strs[rnd() % (sizeof(strs) / sizeof(char *))]); eo_do(o, efl_text_set(buf), evas_obj_text_style_set(st), - evas_obj_color_set(255, 255, 255, 255), + efl_gfx_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)); + efl_gfx_visible_set(EINA_TRUE)); st++; if (st > EVAS_TEXT_STYLE_FAR_SOFT_SHADOW) st = EVAS_TEXT_STYLE_SHADOW; } @@ -70,12 +70,12 @@ static void _loop(double t, int f) Evas_Coord x, y, w, h; for (i = 0; i < OBNUM; i++) { - eo_do(o_texts[i], evas_obj_size_get(&w, &h)); + eo_do(o_texts[i], efl_gfx_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); - eo_do(o_texts[i], evas_obj_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_position_set(x, y)); } FPS_STD(NAME); } diff --git a/src/bin/textblock_auto_align.c b/src/bin/textblock_auto_align.c index c0ec4ce..ecb0895 100644 --- a/src/bin/textblock_auto_align.c +++ b/src/bin/textblock_auto_align.c @@ -52,7 +52,7 @@ static void _setup(void) "‎'טקסט' third, 'english' fourth and 'in' fifth, counting from right to left" "דוגמה of טקסט in english." ), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); evas_textblock_style_free(st); done = 0; @@ -77,8 +77,8 @@ static void _loop(double t, int f) x = (win_w / 2) - (w / 2); y = (win_h / 2) - (h0 / 2); eo_do(o_text, - evas_obj_position_set(x, y), - evas_obj_size_set(w, h)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); FPS_STD(NAME); } diff --git a/src/bin/textblock_basic.c b/src/bin/textblock_basic.c index c3841c8..bde7c34 100644 --- a/src/bin/textblock_basic.c +++ b/src/bin/textblock_basic.c @@ -112,7 +112,7 @@ static void _setup(void) "plutôt naïve Louÿs rêva crapaüter Íosa Úrmhac Óighe pór Éava Ádhaim" "" ), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); evas_textblock_style_free(st); @@ -140,8 +140,8 @@ static void _loop(double t, int f) y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (93.8 * SLOW)) * (h0 / 2); eo_do(o_text, - evas_obj_position_set(x, y), - evas_obj_size_set(w, 5000)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, 5000)); FPS_STD(NAME); } diff --git a/src/bin/textblock_intl.c b/src/bin/textblock_intl.c index 7559599..edb658e 100644 --- a/src/bin/textblock_intl.c +++ b/src/bin/textblock_intl.c @@ -83,7 +83,7 @@ static void _setup(void) "Tibetan: 'ཨུ་ནི་ཀོཌྲ།'
" "Yiddish: 'יוניקאָד'
" ), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); evas_textblock_style_free(st); @@ -110,8 +110,8 @@ static void _loop(double t, int f) y = (win_h / 2) - (h / 2); y += cos((double)(f + (i * 28)) / (19.6 * SLOW)) * (h0 / (2 * 2)); eo_do(o_text, - evas_obj_position_set(x, y), - evas_obj_size_set(w, h)); + efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h)); FPS_STD(NAME); } diff --git a/src/bin/textblock_text_append.c b/src/bin/textblock_text_append.c index 2b34482..93a35aa 100644 --- a/src/bin/textblock_text_append.c +++ b/src/bin/textblock_text_append.c @@ -93,9 +93,9 @@ static void _setup(void) "" "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_obj_position_set(0, 0), - evas_obj_size_set(win_w, win_h), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_position_set(0, 0), + efl_gfx_size_set(win_w, win_h), + efl_gfx_visible_set(EINA_TRUE)); evas_textblock_style_free(st); diff --git a/src/bin/ui.c b/src/bin/ui.c index 147075d..be5185f 100644 --- a/src/bin/ui.c +++ b/src/bin/ui.c @@ -220,15 +220,15 @@ static int test_item = -1; static void _ui_menu_show(Eina_Bool visibility) { - eo_do(o_menu_logo, evas_obj_visibility_set(visibility)); - eo_do(o_menu_title, evas_obj_visibility_set(visibility)); - eo_do(o_menu_icon, evas_obj_visibility_set(visibility)); - eo_do(o_menu_icon_sel, evas_obj_visibility_set(visibility)); + eo_do(o_menu_logo, efl_gfx_visible_set(visibility)); + eo_do(o_menu_title, efl_gfx_visible_set(visibility)); + eo_do(o_menu_icon, efl_gfx_visible_set(visibility)); + eo_do(o_menu_icon_sel, efl_gfx_visible_set(visibility)); /* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */ - eo_do(o_menu_icon_sel2, evas_obj_visibility_set(visibility)); - eo_do(o_menu_text_sel, evas_obj_visibility_set(visibility)); - eo_do(o_title, evas_obj_visibility_set(visibility)); - eo_do(o_byline, evas_obj_visibility_set(visibility)); + eo_do(o_menu_icon_sel2, efl_gfx_visible_set(visibility)); + eo_do(o_menu_text_sel, efl_gfx_visible_set(visibility)); + eo_do(o_title, efl_gfx_visible_set(visibility)); + eo_do(o_byline, efl_gfx_visible_set(visibility)); } static void @@ -244,12 +244,12 @@ _ui_select(void) Menu_Item *mi; mi = l->data; - eo_do(mi->o_icon, evas_obj_visibility_set(EINA_FALSE)); + eo_do(mi->o_icon, efl_gfx_visible_set(EINA_FALSE)); if (i == menu_sel) func = mi->func; } - eo_do(o_title, evas_obj_visibility_set(EINA_FALSE)); - eo_do(o_byline, evas_obj_visibility_set(EINA_FALSE)); + eo_do(o_title, efl_gfx_visible_set(EINA_FALSE)); + eo_do(o_byline, efl_gfx_visible_set(EINA_FALSE)); menu_active = 0; if (func) func(); @@ -362,14 +362,14 @@ _ui_menu_item_full_add(Eina_Bool test, mi = malloc(sizeof(Menu_Item)); mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); eo_do(mi->o_icon, efl_file_set(build_path(icon), NULL), - evas_obj_size_set(32, 32), - evas_obj_image_fill_set(0, 0, 32, 32)); + efl_gfx_size_set(32, 32), + efl_gfx_fill_set(0, 0, 32, 32)); mi->test = test; mi->icon = strdup(icon); mi->text = strdup(text); mi->func = func; menu = eina_list_append(menu, mi); - eo_do(o_menu_icon_sel2, evas_obj_raise()); + eo_do(o_menu_icon_sel2, efl_gfx_stack_raise()); } #define _ui_menu_item_add(Icon, Text, Func) _ui_menu_item_full_add(EINA_TRUE, Icon, Text, Func) @@ -390,90 +390,90 @@ ui_setup(unsigned int ui_w, unsigned int ui_h) win_h = ui_h; o = eo_add(EVAS_RECTANGLE_CLASS, evas); - 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), + eo_do(o, efl_gfx_position_set(0, 0), + efl_gfx_size_set(win_w, win_h), + efl_gfx_color_set(0, 0, 0, 0), + efl_gfx_stack_layer_set(1000), evas_obj_focus_set(1), - evas_obj_visibility_set(EINA_TRUE), + efl_gfx_visible_set(EINA_TRUE), eo_event_callback_array_add(ui_callbacks(), NULL)); o_bg = o; o = eo_add(EVAS_RECTANGLE_CLASS, evas); - 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)); + eo_do(o, efl_gfx_position_set(0, 0), + efl_gfx_size_set(win_w, win_h), + efl_gfx_color_set(255, 255, 255, 255), + efl_gfx_stack_layer_set(-99), + efl_gfx_visible_set(EINA_TRUE)); o_wallpaper = o; o = eo_add(EVAS_TEXT_CLASS, evas); eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set("EXPEDITE"), - evas_obj_layer_set(100), - evas_obj_color_set(0, 0, 0, 100), + efl_gfx_stack_layer_set(100), + efl_gfx_color_set(0, 0, 0, 100), evas_obj_pass_events_set(1), - evas_obj_size_get(&w, &h)); + efl_gfx_size_get(&w, &h)); x = (win_w - w) / 2; y = 0; - eo_do(o, evas_obj_position_set(x, y), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_position_set(x, y), + efl_gfx_visible_set(EINA_TRUE)); o_title = o; o = eo_add(EVAS_TEXT_CLASS, evas); eo_do(o, efl_text_properties_font_set("Vera", 9), efl_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), - evas_obj_layer_set(100), - evas_obj_color_set(0, 0, 0, 60), + efl_gfx_stack_layer_set(100), + efl_gfx_color_set(0, 0, 0, 60), evas_obj_pass_events_set(1), - evas_obj_size_get(&w, NULL)); + efl_gfx_size_get(&w, NULL)); x = (win_w - w) / 2; y = h + 2; - eo_do(o, evas_obj_position_set(x, y), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_position_set(x, y), + efl_gfx_visible_set(EINA_TRUE)); o_byline = o; o = eo_add(EVAS_IMAGE_CLASS, evas); - eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), + eo_do(o, efl_gfx_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), efl_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)); + efl_gfx_fill_set(0, 0, 120, 160), + efl_gfx_size_set(120, 160), + efl_gfx_stack_layer_set(-98), + efl_gfx_color_set(255, 255, 255, 255), + efl_gfx_visible_set(EINA_TRUE)); o_menu_logo = o; o = eo_add(EVAS_IMAGE_CLASS, evas); - 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)); + eo_do(o, efl_gfx_position_set(win_w - 128, - 128), + efl_gfx_fill_set(0, 0, 256, 256), + efl_gfx_size_set(256, 256), + efl_gfx_visible_set(EINA_TRUE)); o_menu_icon = o; o = eo_add(EVAS_IMAGE_CLASS, evas); - eo_do(o, evas_obj_position_set(0, 0), + eo_do(o, efl_gfx_position_set(0, 0), efl_file_set(build_path("icon_sel.png"), NULL), - evas_obj_size_set(48, 48), - evas_obj_image_fill_set(0, 0, 48, 48)); + efl_gfx_size_set(48, 48), + efl_gfx_fill_set(0, 0, 48, 48)); o_menu_icon_sel = o; o = eo_add(EVAS_IMAGE_CLASS, evas); - eo_do(o, evas_obj_position_set(0, 0), + eo_do(o, efl_gfx_position_set(0, 0), efl_file_set(build_path("text_sel.png"), NULL), - evas_obj_size_set(96, 32), - evas_obj_image_fill_set(0, 0, 96, 32), + efl_gfx_size_set(96, 32), + efl_gfx_fill_set(0, 0, 96, 32), evas_obj_image_border_set(7, 7, 7, 7)); o_menu_text_sel = o; o = eo_add(EVAS_TEXT_CLASS, evas); eo_do(o, efl_text_properties_font_set("Vera", 10), efl_text_set(""), - evas_obj_color_set(0, 0, 0, 100), + efl_gfx_color_set(0, 0, 0, 100), evas_obj_pass_events_set(1), - evas_obj_size_get(&w, &h)); + efl_gfx_size_get(&w, &h)); x = (win_w - w) / 2; y = (win_h - h) / 2; - eo_do(o, evas_obj_position_set(x, y)); + eo_do(o, efl_gfx_position_set(x, y)); o_menu_title = o; _ui_menu_item_full_add(EINA_FALSE, "e.png", "About", about_start); @@ -516,8 +516,8 @@ ui_loop(void *data EINA_UNUSED) static double pt = 0.0; double t, t2; - eo_do(o_bg, evas_obj_size_set(win_w, win_h)); - eo_do(o_wallpaper, evas_obj_size_set(win_w, win_h)); + eo_do(o_bg, efl_gfx_size_set(win_w, win_h)); + eo_do(o_wallpaper, efl_gfx_size_set(win_w, win_h)); if (loop_func) { @@ -573,21 +573,21 @@ ui_loop(void *data EINA_UNUSED) Evas_Object *o; o = mi->o_icon; - eo_do(o_menu_logo, evas_obj_size_get(&w, &h)); + eo_do(o_menu_logo, efl_gfx_size_get(&w, &h)); len = ((w * 3) + 10) / 4; - eo_do(o, evas_obj_size_get(&w, &h)); + eo_do(o, efl_gfx_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); - eo_do(o, evas_obj_position_set(x, y)); + eo_do(o, efl_gfx_position_set(x, y)); a = menu_anim - (double)i; if (a < 0) a = -a; a = 255 - (30 * a); - eo_do(o, evas_obj_color_set(a, a, a, a), - evas_obj_visibility_set(EINA_TRUE)); + eo_do(o, efl_gfx_color_set(a, a, a, a), + efl_gfx_visible_set(EINA_TRUE)); if (i == menu_sel) { @@ -596,36 +596,36 @@ ui_loop(void *data EINA_UNUSED) a = 255 - (255 * a); o = o_menu_icon_sel; - eo_do(o, evas_obj_position_set(x - ((48 - w) / 2), y - ((48 - h) / 2)), - evas_obj_color_set(a, a, a, a)); + eo_do(o, efl_gfx_position_set(x - ((48 - w) / 2), y - ((48 - h) / 2)), + efl_gfx_color_set(a, a, a, a)); o = o_menu_title; - eo_do(o, evas_obj_color_set(a, a, a, a), + eo_do(o, efl_gfx_color_set(a, a, a, a), efl_text_set(mi->text), - evas_obj_size_get(&tw, &th)); + efl_gfx_size_get(&tw, &th)); x = (win_w - tw) / 2; y = (win_h / 2) + len + 48; - eo_do(o, evas_obj_position_set(x, y)); + eo_do(o, efl_gfx_position_set(x, y)); o = o_menu_text_sel; w = tw + 24; h = 28; x = x - 12; y = y + ((th - h) / 2); - 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)); + eo_do(o, efl_gfx_position_set(x, y), + efl_gfx_size_set(w, h), + efl_gfx_fill_set(0, 0, w, h), + efl_gfx_color_set(a, a, a, a)); o = o_menu_icon; snprintf(buf, 4096, "%s%s", data_dir, mi->icon); eo_do(o, efl_file_set(buf, NULL), - evas_obj_color_set(a / 2, a / 2, a / 2, a / 2)); + efl_gfx_color_set(a / 2, a / 2, a / 2, a / 2)); } i++; } - 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_logo, efl_gfx_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), + efl_gfx_visible_set(EINA_TRUE)); _ui_menu_show(EINA_TRUE); } else @@ -638,8 +638,8 @@ ui_loop(void *data EINA_UNUSED) void ui_menu(void) { - eo_do(o_title, evas_obj_visibility_set(EINA_TRUE)); - eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE), + eo_do(o_title, efl_gfx_visible_set(EINA_TRUE)); + eo_do(o_byline, efl_gfx_visible_set(EINA_TRUE), efl_text_set ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.")); menu_active = 1; diff --git a/src/bin/widgets_file_icons.c b/src/bin/widgets_file_icons.c index 6805d3d..e77735b 100644 --- a/src/bin/widgets_file_icons.c +++ b/src/bin/widgets_file_icons.c @@ -49,18 +49,18 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 13]), evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW), - evas_obj_color_set(255, 255, 255, 255), + efl_gfx_color_set(255, 255, 255, 255), evas_obj_text_shadow_color_set(0, 0, 0, 24), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -85,10 +85,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 b3e2c0e..009c7cb 100644 --- a/src/bin/widgets_file_icons_2.c +++ b/src/bin/widgets_file_icons_2.c @@ -49,16 +49,16 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 13]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -83,10 +83,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 0c35a9b..8691b0c 100644 --- a/src/bin/widgets_file_icons_2_grouped.c +++ b/src/bin/widgets_file_icons_2_grouped.c @@ -49,25 +49,25 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 13]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { if (i > 13) - eo_do(o_images[i], evas_obj_stack_above(o_images[i - 13])); + eo_do(o_images[i], efl_gfx_stack_above(o_images[i - 13])); } done = 0; } @@ -92,10 +92,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 983b0d8..26fb8ad 100644 --- a/src/bin/widgets_file_icons_2_same.c +++ b/src/bin/widgets_file_icons_2_same.c @@ -34,16 +34,16 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 1]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -68,10 +68,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 23405be..2de23d3 100644 --- a/src/bin/widgets_file_icons_2_same_grouped.c +++ b/src/bin/widgets_file_icons_2_same_grouped.c @@ -34,20 +34,20 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 1]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); } done = 0; } @@ -72,10 +72,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 86f71aa..5d660ef 100644 --- a/src/bin/widgets_file_icons_3.c +++ b/src/bin/widgets_file_icons_3.c @@ -49,16 +49,16 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 13]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -83,10 +83,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 b186f43..99fa952 100644 --- a/src/bin/widgets_file_icons_4.c +++ b/src/bin/widgets_file_icons_4.c @@ -49,16 +49,16 @@ static void _setup(void) o = eo_add(EVAS_IMAGE_CLASS, evas); o_images[i] = o; eo_do(o, efl_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)); + efl_gfx_fill_set(0, 0, ICON_SIZE, ICON_SIZE), + efl_gfx_size_set(ICON_SIZE, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(icons[i % 13]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -83,10 +83,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x + 8, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x + 8, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE + 16 - tw) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + cent, y + ICON_SIZE + 4)); + eo_do(o_texts[i], efl_gfx_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 546ee90..d8d2268 100644 --- a/src/bin/widgets_list_1.c +++ b/src/bin/widgets_list_1.c @@ -67,15 +67,15 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -100,10 +100,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 5c4449d..e2beadb 100644 --- a/src/bin/widgets_list_1_grouped.c +++ b/src/bin/widgets_list_1_grouped.c @@ -67,23 +67,23 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { - eo_do(o_texts[i], evas_obj_raise()); + eo_do(o_texts[i], efl_gfx_stack_raise()); } done = 0; } @@ -108,10 +108,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 7c5875f..614ec22 100644 --- a/src/bin/widgets_list_2.c +++ b/src/bin/widgets_list_2.c @@ -67,15 +67,15 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -100,10 +100,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 08de68d..3ddb9fa 100644 --- a/src/bin/widgets_list_2_grouped.c +++ b/src/bin/widgets_list_2_grouped.c @@ -67,23 +67,23 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { - eo_do(o_texts[i], evas_obj_raise()); + eo_do(o_texts[i], efl_gfx_stack_raise()); } done = 0; } @@ -108,10 +108,10 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_position_set(x, y)); - eo_do(o_texts[i], evas_obj_size_get(&tw, &th)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 0f0049f..05cd130 100644 --- a/src/bin/widgets_list_3.c +++ b/src/bin/widgets_list_3.c @@ -88,23 +88,23 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_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), efl_file_set(build_path(icons[i % 13]), NULL), - evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(ICON_SIZE - 8, ICON_SIZE - 8), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -130,11 +130,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - 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)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_icons[i], efl_gfx_position_set(x + 4, y + 4)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 aaf5f39..8fb3603 100644 --- a/src/bin/widgets_list_3_grouped.c +++ b/src/bin/widgets_list_3_grouped.c @@ -88,40 +88,40 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_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), efl_file_set(build_path(icons[i % 13]), NULL), - evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(ICON_SIZE - 8, ICON_SIZE - 8), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { - eo_do(o_icons[i], evas_obj_raise()); + eo_do(o_icons[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { if (i > 13) - eo_do(o_icons[i], evas_obj_stack_above(o_icons[i - 13])); + eo_do(o_icons[i], efl_gfx_stack_above(o_icons[i - 13])); } for (i = 0; i < NUM; i++) { - eo_do(o_texts[i], evas_obj_raise()); + eo_do(o_texts[i], efl_gfx_stack_raise()); } done = 0; } @@ -147,11 +147,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - 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)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_icons[i], efl_gfx_position_set(x + 4, y + 4)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 2211c17..3745230 100644 --- a/src/bin/widgets_list_4.c +++ b/src/bin/widgets_list_4.c @@ -88,23 +88,23 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_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), efl_file_set(build_path(icons[i % 13]), NULL), - evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(ICON_SIZE - 8, ICON_SIZE - 8), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } done = 0; } @@ -127,11 +127,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - 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)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_icons[i], efl_gfx_position_set(x + 4, y + 4)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_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 381b887..ef22be7 100644 --- a/src/bin/widgets_list_4_grouped.c +++ b/src/bin/widgets_list_4_grouped.c @@ -88,39 +88,39 @@ static void _setup(void) eo_do(o, evas_obj_image_filled_set(1), evas_obj_image_border_set(2, 2, 2, 2), efl_file_set(build_path("pan.png"), NULL), - evas_obj_size_set(win_w, ICON_SIZE), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(win_w, ICON_SIZE), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_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), efl_file_set(build_path(icons[i % 13]), NULL), - evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_size_set(ICON_SIZE - 8, ICON_SIZE - 8), + efl_gfx_visible_set(EINA_TRUE)); o = eo_add(EVAS_TEXT_CLASS, evas); o_texts[i] = o; eo_do(o, efl_text_properties_font_set("Vera-Bold", 10), efl_text_set(labels[i % 26]), - evas_obj_color_set(0, 0, 0, 255), - evas_obj_visibility_set(EINA_TRUE)); + efl_gfx_color_set(0, 0, 0, 255), + efl_gfx_visible_set(EINA_TRUE)); } for (i = 0; i < NUM; i++) { - eo_do(o_images[i], evas_obj_raise()); + eo_do(o_images[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { - eo_do(o_icons[i], evas_obj_raise()); + eo_do(o_icons[i], efl_gfx_stack_raise()); } for (i = 0; i < NUM; i++) { - eo_do(o_icons[i], evas_obj_stack_above(o_icons[i - 13])); + eo_do(o_icons[i], efl_gfx_stack_above(o_icons[i - 13])); } for (i = 0; i < NUM; i++) { - eo_do(o_texts[i], evas_obj_raise()); + eo_do(o_texts[i], efl_gfx_stack_raise()); } done = 0; } @@ -146,11 +146,11 @@ static void _loop(double t, int f) y = 0 - f; for (i = 0; i < NUM; i++) { - 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)); + eo_do(o_images[i], efl_gfx_position_set(x, y)); + eo_do(o_icons[i], efl_gfx_position_set(x + 4, y + 4)); + eo_do(o_texts[i], efl_gfx_size_get(&tw, &th)); cent = (ICON_SIZE - th) / 2; - eo_do(o_texts[i], evas_obj_position_set(x + 8 + ICON_SIZE + 8, y + cent)); + eo_do(o_texts[i], efl_gfx_position_set(x + 8 + ICON_SIZE + 8, y + cent)); y += ICON_SIZE; } FPS_STD(NAME);