Merge "[elm_datetime.h] Datetime default minimum year is changed to 1902 and document...

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

diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index ea0fe4c..295bd6d 100644 (file)
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 void
 my_bt_go_300_300(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
@@ -30,7 +30,7 @@ my_bt_go_900_900(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNU
 void
 test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg2, *tb, *tb2, *bg, *sc, *bt;
+   Evas_Object *win, *bg2, *tb, *tb2, *sc, *bt;
    int i, j, n;
    char buf[PATH_MAX];
    const char *img[9] =
@@ -46,14 +46,8 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
           "wood_01.jpg"
      };
 
-   win = elm_win_add(NULL, "scroller", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Scroller");
-   elm_win_autodel_set(win, 1);
-
-   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);
-   evas_object_show(bg);
+   win = elm_win_util_standard_add("scroller", "Scroller");
+   elm_win_autodel_set(win, EINA_TRUE);
 
    tb = elm_table_add(win);
    evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -65,7 +59,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
           {
              bg2 = elm_bg_add(win);
              snprintf(buf, sizeof(buf), "%s/images/%s",
-                      PACKAGE_DATA_DIR, img[n]);
+                      elm_app_data_dir_get(), img[n]);
              n++;
              if (n >= 9) n = 0;
              elm_bg_file_set(bg2, buf, NULL);
@@ -81,11 +75,10 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    elm_win_resize_object_add(win, sc);
 
-   elm_scroller_content_set(sc, tb);
+   elm_object_content_set(sc, tb);
    evas_object_show(tb);
 
    elm_scroller_page_relative_set(sc, 1.0, 1.0);
-//   elm_scroller_page_size_set(sc, 200, 200);
    evas_object_show(sc);
 
    tb2 = elm_table_add(win);
@@ -139,17 +132,11 @@ click_through(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED
 void
 test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bt, *bx, *bx2, *bg, *sc, *tb, *tb2, *rc;
+   Evas_Object *win, *bt, *bx, *bx2, *sc, *tb, *tb2, *rc;
    int i, j;
 
-   win = elm_win_add(NULL, "scroller2", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Scroller 2");
-   elm_win_autodel_set(win, 1);
-
-   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);
-   evas_object_show(bg);
+   win = elm_win_util_standard_add("scroller2", "Scroller 2");
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0);
@@ -172,7 +159,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    sc = elm_scroller_add(win);
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, 0.5);
-   elm_scroller_bounce_set(sc, 1, 0);
+   elm_scroller_bounce_set(sc, EINA_TRUE, EINA_FALSE);
    elm_scroller_content_min_limit(sc, 0, 1);
    elm_box_pack_end(bx, sc);
    evas_object_show(sc);
@@ -189,7 +176,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
         evas_object_show(bt);
      }
 
-   elm_scroller_content_set(sc, bx2);
+   elm_object_content_set(sc, bx2);
    evas_object_show(bx2);
    /* } */
 
@@ -237,7 +224,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
           }
      }
 
-   elm_scroller_content_set(sc, tb2);
+   elm_object_content_set(sc, tb2);
    evas_object_show(tb2);
    /* } */
 
@@ -254,9 +241,9 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    sc = elm_scroller_add(win);
    evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   elm_scroller_bounce_set(sc, 0, 1);
+   elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE);
    elm_win_resize_object_add(win, sc);
-   elm_scroller_content_set(sc, bx);
+   elm_object_content_set(sc, bx);
    evas_object_show(bx);
    evas_object_show(sc);