From d9fa84707bdc1f8b93ff82f39c500b74c731a8ca Mon Sep 17 00:00:00 2001 From: seoz Date: Thu, 8 Mar 2012 11:25:36 +0000 Subject: [PATCH] elm test_list.c: Changed to use elm_win_util_standard_add() for normal cases. Signed-off-by: Daniel Juyung Seo git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69053 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/bin/test_list.c | 50 ++++++++++---------------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/src/bin/test_list.c b/src/bin/test_list.c index ea93e68..7ce4c7f 100644 --- a/src/bin/test_list.c +++ b/src/bin/test_list.c @@ -286,21 +286,15 @@ test_list(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *li, *ic, *ic2, *bx, *tb2, *bt, *bxx; + Evas_Object *win, *li, *ic, *ic2, *bx, *tb2, *bt, *bxx; char buf[PATH_MAX]; Elm_Object_Item *list_it1, *list_it2, *list_it3, *list_it4, *list_it5; api_data *api = calloc(1, sizeof(api_data)); - win = elm_win_add(NULL, "list", ELM_WIN_BASIC); - elm_win_title_set(win, "List"); + win = elm_win_util_standard_add("list", "List"); elm_win_autodel_set(win, EINA_TRUE); evas_object_event_callback_add(win, EVAS_CALLBACK_FREE, _cleanup_cb, api); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - bxx = elm_box_add(win); elm_win_resize_object_add(win, bxx); evas_object_size_hint_weight_set(bxx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -450,19 +444,13 @@ test_list_horizontal(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *li, *ic, *ic2, *bx, *tb2, *bt; + Evas_Object *win, *li, *ic, *ic2, *bx, *tb2, *bt; char buf[PATH_MAX]; Elm_Object_Item *list_it1, *list_it2, *list_it3, *list_it4; - win = elm_win_add(NULL, "list-horizontal", ELM_WIN_BASIC); - elm_win_title_set(win, "List Horizontal"); + win = elm_win_util_standard_add("list-horizontal", "List Horizontal"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - li = elm_list_add(win); elm_list_horizontal_set(li, EINA_TRUE); elm_list_mode_set(li, ELM_LIST_LIMIT); @@ -728,18 +716,12 @@ test_list3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *li, *ic, *ic2, *bx; + Evas_Object *win, *li, *ic, *ic2, *bx; char buf[PATH_MAX]; - win = elm_win_add(NULL, "list3", ELM_WIN_BASIC); - elm_win_title_set(win, "List 3"); + win = elm_win_util_standard_add("list3", "List 3"); elm_win_autodel_set(win, EINA_TRUE); - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - li = elm_list_add(win); elm_win_resize_object_add(win, li); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -890,20 +872,14 @@ test_list4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *li, *ic, *ic2, *naviframe; + Evas_Object *win, *li, *ic, *ic2, *naviframe; static struct Pginfo info = {NULL, NULL}; char buf[PATH_MAX]; - win = elm_win_add(NULL, "list4", ELM_WIN_BASIC); - elm_win_title_set(win, "List 4"); + win = elm_win_util_standard_add("list4", "List 4"); elm_win_autodel_set(win, EINA_TRUE); info.win = win; - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - naviframe = elm_naviframe_add(win); elm_win_resize_object_add(win, naviframe); evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -1021,19 +997,13 @@ test_list5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - Evas_Object *win, *bg, *li; + Evas_Object *win, *li; static struct list5_data_cb info; - win = elm_win_add(NULL, "list5", ELM_WIN_BASIC); - elm_win_title_set(win, "List 5"); + win = elm_win_util_standard_add("list5", "List 5"); elm_win_autodel_set(win, EINA_TRUE); info.win = win; - bg = elm_bg_add(win); - elm_win_resize_object_add(win, bg); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(bg); - li = elm_list_add(win); evas_object_size_hint_weight_set(li, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_list_mode_set(li, ELM_LIST_COMPRESS); -- 2.7.4