containing ui setup steps in the profiling again.

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

diff --git a/src/bin/ui.c b/src/bin/ui.c
index 21198fa..621c4de 100644 (file)
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -415,9 +415,14 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_wallpaper = o;
 
    o = evas_object_text_add(evas);
+#if 0
    efl_text_font_family_set(o, "Vera-Bold");
    efl_text_font_size_set(o, 10);
    efl_text_set(o, "EXPEDITE");
+#else
+   evas_object_text_font_set(o, "Vera-Bold", 10);
+   evas_object_text_text_set(o, "EXPEDITE");
+#endif
    efl_gfx_stack_layer_set(o, 100);
    efl_gfx_color_set(o, 0, 0, 0, 100);
    evas_object_pass_events_set(o, 1);
@@ -429,9 +434,14 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_title = o;
 
    o = evas_object_text_add(evas);
+#if 0
    efl_text_font_family_set(o, "Vera");
    efl_text_font_size_set(o, 9);
    efl_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
+#else
+   evas_object_text_font_set(o, "Vera", 9);
+   evas_object_text_text_set(o, "LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.");
+#endif
    efl_gfx_stack_layer_set(o, 100);
    efl_gfx_color_set(o, 0, 0, 0, 60);
    evas_object_pass_events_set(o, 1);
@@ -468,9 +478,14 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
    o_menu_text_sel = o;
 
    o = evas_object_text_add(evas);
+#if 0
    efl_text_font_family_set(o, "Vera");
    efl_text_font_size_set(o, 10);
    efl_text_set(o, "");
+#else
+   evas_object_text_font_set(o, "Vera", 10);
+   evas_object_text_text_set(o, "");
+#endif
    efl_gfx_color_set(o, 0, 0, 0, 100);
    evas_object_pass_events_set(o, 1);
    exp_size_get(o, &w, &h);
@@ -661,7 +676,7 @@ ui_menu(void)
 }
 
 void
-ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f))
+ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f), void (*lsetup) (void))
 {
    key_func = kfunc;
    loop_func = lfunc;
@@ -669,6 +684,8 @@ ui_func_set(void (*kfunc) (const char *key), void (*lfunc) (double t, int f))
    f_loop = f_start = 0;
    ui_fps(0.0);
 
+   lsetup();
+
    if (tick)
      {
         ecore_animator_source_set(ECORE_ANIMATOR_SOURCE_CUSTOM);