Elementary migration revision 70341

[framework/uifw/elementary.git] / src / bin / test_focus.c

diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index eb6d81e..af30f30 100644 (file)
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -1,8 +1,8 @@
 /* Test for Focus Chain Linear*/
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 static Eina_Bool
@@ -57,23 +57,13 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    Evas_Object *win;
    unsigned int i, j;
 
-   win = elm_win_add(NULL, "focus", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Focus");
+   win = elm_win_util_standard_add("focus", "Focus");
    elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
    evas_object_resize(win, 800, 600);
    elm_object_event_callback_add(win, _event, NULL);
    elm_win_autodel_set(win, EINA_TRUE);
    my_show(win);
 
-     {
-        Evas_Object *bg;
-        bg = elm_bg_add(win);
-        evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
-                                         EVAS_HINT_EXPAND);
-        elm_win_resize_object_add(win, bg);
-        my_show(bg);
-     }
-
    Evas_Object *mainbx = elm_box_add(win);
    elm_box_horizontal_set(mainbx, EINA_TRUE);
    elm_win_resize_object_add(win, mainbx);
@@ -90,10 +80,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
           {
              Evas_Object *lb = elm_label_add(win);
-             elm_object_text_set(lb,
-                                 "<b>Use Tab, Shift+Tab, and<br/>"
-                                                                "Arrow Keys</b>"
-                                );
+             elm_object_text_set(lb, "<b>Use Tab or Shift+Tab</b>");
              evas_object_size_hint_weight_set(lb, 0.0, 0.0);
              evas_object_size_hint_align_set(lb, EVAS_HINT_FILL,
                                              EVAS_HINT_FILL);
@@ -219,11 +206,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                                                    EVAS_HINT_EXPAND);
                   evas_object_size_hint_align_set(sc, EVAS_HINT_FILL,
                                                   EVAS_HINT_FILL);
-<<<<<<< HEAD
-                  elm_scroller_bounce_set(sc, 0, 1);
-=======
                   elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE);
->>>>>>> remotes/origin/upstream
                   elm_scroller_content_min_limit(sc, 1, 0);
                   elm_box_pack_end(bx2, sc);
                   my_show(sc);