X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_scroller.c;h=295bd6d2e23b0c4ffce06a31598fd4d95a511254;hb=27a6411b0f9d0511df1c7d630364d9bede4a1690;hp=a2d998030f3bc141763a1755764fe60b9a476f27;hpb=a80a85d71b2636371705ece3692659b41098c5ae;p=framework%2Fuifw%2Felementary.git diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c index a2d9980..295bd6d 100644 --- a/src/bin/test_scroller.c +++ b/src/bin/test_scroller.c @@ -1,7 +1,7 @@ -#include #ifdef HAVE_CONFIG_H # include "elementary_config.h" #endif +#include #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,15 +46,9 @@ 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"); + win = elm_win_util_standard_add("scroller", "Scroller"); elm_win_autodel_set(win, EINA_TRUE); - 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); - tb = elm_table_add(win); evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -138,18 +132,12 @@ 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"); + win = elm_win_util_standard_add("scroller2", "Scroller 2"); elm_win_autodel_set(win, EINA_TRUE); - 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); - bx = elm_box_add(win); evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, 0.0);