Merge branch 'intefl/svn_merge' of ssh://165.213.149.219:29418/slp/pkgs/e/elementary...

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

diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index d964f48..eb6d81e 100644 (file)
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -91,7 +91,8 @@ 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 and Shift+Tab</b>"
+                                 "<b>Use Tab, Shift+Tab, and<br/>"
+                                                                "Arrow Keys</b>"
                                 );
              evas_object_size_hint_weight_set(lb, 0.0, 0.0);
              evas_object_size_hint_align_set(lb, EVAS_HINT_FILL,
@@ -114,8 +115,8 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
              elm_entry_scrollable_set(en, EINA_TRUE);
              evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
              evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
-             elm_entry_entry_set(en, "This is a single line");
-             elm_entry_single_line_set(en, 1);
+             elm_object_text_set(en, "This is a single line");
+             elm_entry_single_line_set(en, EINA_TRUE);
              elm_box_pack_end(bx, en);
              my_show(en);
           }
@@ -148,7 +149,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);
-                  elm_scroller_bounce_set(sc, 1, 1);
+                  elm_scroller_bounce_set(sc, EINA_TRUE, EINA_TRUE);
                   elm_scroller_content_min_limit(sc, 1, 1);
                   elm_box_pack_end(bx2, sc);
                   my_show(sc);
@@ -218,7 +219,11 @@ 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);
@@ -261,7 +266,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
              evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
                                              EVAS_HINT_FILL);
              evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
-             elm_object_content_part_set(ly, "element1", bx2);
+             elm_object_part_content_set(ly, "element1", bx2);
              my_show(bx2);
 
              for (i = 3; i; i--)
@@ -283,7 +288,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
              evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
                                              EVAS_HINT_FILL);
              evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
-             elm_object_content_part_set(ly, "element2", bx2);
+             elm_object_part_content_set(ly, "element2", bx2);
              my_show(bx2);
 
                {