fixed plugin image size problem

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

diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c
index 5e8ee05..925a1aa 100644 (file)
--- a/src/bin/test_conform.c
+++ b/src/bin/test_conform.c
@@ -1,24 +1,18 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 
 void
 test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
 {
-   Evas_Object *win, *bg, *conform, *btn, *bx, *en;
+   Evas_Object *win, *conform, *btn, *bx, *en;
 
-   win = elm_win_add(NULL, "conformant", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Conformant");
+   win = elm_win_util_standard_add("conformant", "Conformant");
    elm_win_autodel_set(win, EINA_TRUE);
    elm_win_conformant_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);
-
    conform = elm_conformant_add(win);
    elm_win_resize_object_add(win, conform);
    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -90,24 +84,18 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 static void
 popobj(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
 {
-   elm_pager_content_pop(data);
+   elm_naviframe_item_pop(data);
 }
 
 void
 test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event __UNUSED__)
 {
-   Evas_Object *win, *bg, *conform, *btn, *bx, *en, *pg;
+   Evas_Object *win, *conform, *btn, *bx, *en, *pg;
 
-   win = elm_win_add(NULL, "conformant2", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Conformant 2");
+   win = elm_win_util_standard_add("conformant2", "Conformant 2");
    elm_win_autodel_set(win, EINA_TRUE);
    elm_win_conformant_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);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -132,7 +120,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_box_pack_end(bx, btn);
    evas_object_show(btn);
 
-   pg = elm_pager_add(win);
+   pg = elm_naviframe_add(win);
    evas_object_size_hint_weight_set(pg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(pg, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, pg);
@@ -143,7 +131,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    conform = elm_conformant_add(win);
    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_pager_content_push(pg, conform);
+   elm_naviframe_item_simple_push(pg, conform);
    evas_object_show(conform);
 
    bx = elm_box_add(win);
@@ -175,7 +163,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    conform = elm_conformant_add(win);
    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(conform, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   elm_pager_content_push(pg, conform);
+   elm_naviframe_item_simple_push(pg, conform);
    evas_object_show(conform);
 
    bx = elm_box_add(win);