X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbin%2Ftest_box.c;h=1b191f9f54e1537b07d861a97bc632edb21dba28;hb=HEAD;hp=82e290db9c8b884c5b1e870f5281fdc5705fb2dc;hpb=c95ca110ce8fe2583917e32c56a6b807336893d8;p=framework%2Fuifw%2Felementary.git

diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index 82e290d..1b191f9 100644
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -1,8 +1,8 @@
-#include <Elementary.h>
 #include "test.h"
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 #define ICON_MAX 24
 
@@ -39,7 +39,7 @@ static void
 set_api_state(api_data *api)
 {
    const Eina_List *items = elm_box_children_get(api->box);
-   if(!eina_list_count(items))
+   if (!eina_list_count(items))
      return;
 
    /* use elm_box_children_get() to get list of children */
@@ -51,7 +51,7 @@ set_api_state(api_data *api)
          break;
 
       case BOX_PACK_BEFORE:
-         if(eina_list_count(items) > 1)
+         if (eina_list_count(items) > 1)
                {  /* Put last item before the one preceeding it */
                   elm_box_unpack(api->box, eina_list_data_get(eina_list_last(items)));
                   elm_box_pack_before(api->box,
@@ -61,7 +61,7 @@ set_api_state(api_data *api)
          break;
 
       case BOX_PACK_AFTER:
-         if(eina_list_count(items) > 1)
+         if (eina_list_count(items) > 1)
                {  /* Put item before last to last */
                   elm_box_unpack(api->box, eina_list_nth(items,
                            eina_list_count(items)-2));
@@ -129,20 +129,14 @@ _cleanup_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *e
 void
 test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *ic, *bxx, *bt;
+   Evas_Object *win, *bx, *ic, *bxx, *bt;
    char buf[PATH_MAX];
    api_data *api = calloc(1, sizeof(api_data));
 
-   win = elm_win_add(NULL, "box-vert", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Box Vert");
+   win = elm_win_util_standard_add("box-vert", "Box Vert");
    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);
@@ -165,7 +159,7 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -173,7 +167,7 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -181,7 +175,7 @@ test_box_vert(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, EVAS_HINT_EXPAND, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -201,17 +195,11 @@ _del_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 void
 test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *bt;
+   Evas_Object *win, *bx, *bt;
 
-   win = elm_win_add(NULL, "box-vert2", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Box Vert 2");
+   win = elm_win_util_standard_add("box-vert2", "Box Vert 2");
    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);
-
    bx = elm_box_add(win);
    elm_win_resize_object_add(win, bx);
    elm_box_padding_set(bx, 10, 10);
@@ -264,18 +252,13 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 void
 test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *ic, *bxx, *bt;
+   Evas_Object *win, *bx, *ic, *bxx, *bt;
    char buf[PATH_MAX];
    api_data *api = calloc(1, sizeof(api_data));
 
-   win = elm_win_add(NULL, "box-horiz", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Box Horiz");
+   win = elm_win_util_standard_add("box-horiz", "Box Horiz");
    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);
@@ -300,7 +283,7 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_01.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.5);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -308,7 +291,7 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_02.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.5, 0.0);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -316,7 +299,7 @@ test_box_horiz(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/icon_03.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_size_hint_align_set(ic, 0.0, EVAS_HINT_EXPAND);
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
@@ -655,18 +638,12 @@ _win_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 void
 test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *bt;
+   Evas_Object *win, *bx, *bt;
    Transitions_Data *tdata;
 
-   win = elm_win_add(NULL, "box-transition", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Box Transition");
+   win = elm_win_util_standard_add("box-transition", "Box Transition");
    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, 1.0, 1.0);
-   evas_object_show(bg);
-
    bx = elm_box_add(win);
    elm_win_resize_object_add(win, bx);
    evas_object_size_hint_weight_set(bx, 1.0, 1.0);