containing ui setup steps in the profiling again.

[platform/upstream/expedite.git] / src / bin / image_blend_solid_border.c

diff --git a/src/bin/image_blend_solid_border.c b/src/bin/image_blend_solid_border.c
old mode 100644 (file)
new mode 100755 (executable)
index 2e1b0bb..2ebe579
--- a/src/bin/image_blend_solid_border.c
+++ b/src/bin/image_blend_solid_border.c
@@ -23,11 +23,11 @@ static void _setup(void)
    Evas_Object *o;
    for (i = 0; i < OBNUM; i++)
      {
-       o = evas_object_image_add(evas);
-       o_images[i] = o;
-       evas_object_image_file_set(o, build_path("frame.png"), NULL);
-       evas_object_image_border_set(o, 8, 8, 8, 8);
-       evas_object_show(o);
+        o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas);
+        o_images[i] = o;
+        efl_file_simple_load(o, build_path("frame.png"), NULL);
+        efl_gfx_image_border_insets_set(o, 8, 8, 8, 8);
+        efl_gfx_entity_visible_set(o, EINA_TRUE);
      }
    done = 0;
 }
@@ -36,7 +36,7 @@ static void _setup(void)
 static void _cleanup(void)
 {
    int i;
-   for (i = 0; i < OBNUM; i++) evas_object_del(o_images[i]);
+   for (i = 0; i < OBNUM; i++) efl_del(o_images[i]);
 }
 
 /* loop - do things */
@@ -47,22 +47,22 @@ static void _loop(double t, int f)
    for (i = 0; i < OBNUM; i++)
      {
         w0 = 80;
-       h0 = 80;
-       w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
-       h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
-       x = (win_w / 2) - (w / 2);
-       x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
-       y = (win_h / 2) - (h / 2);
-       y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
-       evas_object_move(o_images[i], x, y);
-       evas_object_resize(o_images[i], w, h);
-       evas_object_image_fill_set(o_images[i], 0, 0, w, h);
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        efl_gfx_entity_position_set(o_images[i], EINA_POSITION2D(x, y));
+        efl_gfx_entity_size_set(o_images[i], EINA_SIZE2D(w, h));
+        efl_gfx_fill_set(o_images[i], EINA_RECT(0, 0, w, h));
      }
    FPS_STD(NAME);
 }
 
 /* prepend special key handlers if interactive (before STD) */
-static void _key(char *key)
+static void _key(const char *key)
 {
    KEY_STD;
 }
@@ -94,8 +94,7 @@ void FNAME(void);
 # ifndef UI
 void FNAME(void)
 {
-   ui_func_set(_key, _loop);
-   _setup();
+   ui_func_set(_key, _loop, _setup);
 }
 # endif
 #endif