remove elm_win_resize_object_add() API except for conformant object

Change-Id: I7f36012be3f81966051584f5ee4e0e4f7fed67b8

diff --git a/setting-about/src/setting-about.c b/setting-about/src/setting-about.c
index bf8cedc..e5d3b47 100755 (executable)
--- a/setting-about/src/setting-about.c
+++ b/setting-about/src/setting-about.c
@@ -441,7 +441,7 @@ void setting_about_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/setting-common/src/setting-common-draw-widget.c b/setting-common/src/setting-common-draw-widget.c
index d325140..17ee5ee 100755 (executable)
--- a/setting-common/src/setting-common-draw-widget.c
+++ b/setting-common/src/setting-common-draw-widget.c
@@ -584,7 +584,7 @@ Evas_Object *setting_create_bg(Evas_Object *parent,Evas_Object *win, const char
        elm_object_style_set(bg, bg_style);
        evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
                                         EVAS_HINT_EXPAND);
-       elm_win_resize_object_add(win, bg);
+       //elm_win_resize_object_add(win, bg);
        evas_object_show(bg);
        return bg;
 }

diff --git a/setting-display/src/setting-display.c b/setting-display/src/setting-display.c
index ace8bf0..36da0bb 100755 (executable)
--- a/setting-display/src/setting-display.c
+++ b/setting-display/src/setting-display.c
@@ -309,7 +309,7 @@ void setting_display_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/setting-menuscreen/src/setting-menuscreen.c b/setting-menuscreen/src/setting-menuscreen.c
index d89479f..2ac7b53 100755 (executable)
--- a/setting-menuscreen/src/setting-menuscreen.c
+++ b/setting-menuscreen/src/setting-menuscreen.c
@@ -264,7 +264,7 @@ void setting_menuscreen_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/setting-profile/src/setting-profile-sound-main.c b/setting-profile/src/setting-profile-sound-main.c
index 6fc3bbb..0d68b54 100755 (executable)
--- a/setting-profile/src/setting-profile-sound-main.c
+++ b/setting-profile/src/setting-profile-sound-main.c
@@ -1218,7 +1218,7 @@ setting_profile_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
        switch (mode) {
                case UG_MODE_FULLVIEW:
                        evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-                       elm_win_resize_object_add(ad->win_get, base);
+                       //elm_win_resize_object_add(ad->win_get, base);
                        evas_object_show(base);
                        break;
                default:

diff --git a/setting-reset/src/setting-reset-settings.c b/setting-reset/src/setting-reset-settings.c
index 9cdffc0..2dedb3a 100755 (executable)
--- a/setting-reset/src/setting-reset-settings.c
+++ b/setting-reset/src/setting-reset-settings.c
@@ -706,7 +706,7 @@ setting_reset_settings_layout_ug_cb(ui_gadget_h ug, enum ug_mode mode,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/setting-security/src/setting-security.c b/setting-security/src/setting-security.c
index e7a06dc..fba8580 100755 (executable)
--- a/setting-security/src/setting-security.c
+++ b/setting-security/src/setting-security.c
@@ -495,7 +495,7 @@ void setting_security_layout_passwd_ug_cb(ui_gadget_h ug,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/setting-storage/src/setting-storage-main.c b/setting-storage/src/setting-storage-main.c
index 94fe6eb..f0a3956 100755 (executable)
--- a/setting-storage/src/setting-storage-main.c
+++ b/setting-storage/src/setting-storage-main.c
@@ -477,7 +477,7 @@ static void __setting_storage_main_launch_ug_layout_cb(ui_gadget_h ug, enum ug_m
        switch (mode) {
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/setting-time/src/setting-time-main.c b/setting-time/src/setting-time-main.c
index 38cd940..a5555fc 100755 (executable)
--- a/setting-time/src/setting-time-main.c
+++ b/setting-time/src/setting-time-main.c
@@ -586,7 +586,7 @@ Evas_Object *setting_create_win_layout2(Evas_Object *win_layout,
        elm_layout_theme_set(layout, "layout", "application", "default");
        evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_win_resize_object_add(win_obj, layout);
+       //elm_win_resize_object_add(win_obj, layout);
        //elm_win_resize_object_add(win_obj, conform);
        //elm_object_content_set(conform, layout);
 
@@ -1214,7 +1214,7 @@ void setting_time_main_launch_worldclock_layout_ug_cb(ui_gadget_h ug,
        case UG_MODE_FULLVIEW:
                evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND,
                                                 EVAS_HINT_EXPAND);
-               elm_win_resize_object_add(ad->win_get, base);
+               //elm_win_resize_object_add(ad->win_get, base);
                evas_object_show(base);
                break;
        default:

diff --git a/src/plugin-resource/test_server.c b/src/plugin-resource/test_server.c
index 6357d16..9043fb4 100755 (executable)
--- a/src/plugin-resource/test_server.c
+++ b/src/plugin-resource/test_server.c
@@ -206,7 +206,7 @@ static Evas_Object* _create_bg(Evas_Object *parent)
 
     bg = elm_bg_add(parent);
     evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_win_resize_object_add(parent, bg);
+    //elm_win_resize_object_add(parent, bg);
     evas_object_show(bg);
 
     return bg;
@@ -220,7 +220,7 @@ static Evas_Object* _create_layout_main(Evas_Object* parent)
 
     elm_layout_theme_set(layout, "layout", "application", "default");
     evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-    elm_win_resize_object_add(parent, layout);
+    //elm_win_resize_object_add(parent, layout);
 
     evas_object_show(layout);
 

diff --git a/src/setting-plugin.c b/src/setting-plugin.c
index 5784285..c92de62 100755 (executable)
--- a/src/setting-plugin.c
+++ b/src/setting-plugin.c
@@ -1134,24 +1134,24 @@ static Evas_Object *setting_create_win_layout2(Evas_Object *win_layout, Evas_Obj
 {
 
     Evas_Object *layout = NULL;
-    Evas_Object *conform = elm_conformant_add(win_obj);
+    //Evas_Object *conform = elm_conformant_add(win_obj);
     //setting_main_appdata *ad = (setting_main_appdata *) data;
 
     /*  Base Layout */
-    layout = elm_layout_add(conform);
-    evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    layout = elm_layout_add(win_obj);
+    //evas_object_size_hint_weight_set(conform, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     setting_retvm_if(layout == NULL, FALSE, "layout == NULL");
 
     elm_layout_theme_set(layout, "layout", "application", "default");
-    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_win_resize_object_add(win_obj, conform);
-    elm_object_content_set(conform, layout);
+    evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+    evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+    //elm_win_resize_object_add(win_obj, conform);
+    //elm_object_content_set(conform, layout);
 
     Evas_Object *bg = setting_create_bg(layout, win_obj, "group_list");
     elm_object_part_content_set(layout, "elm.swallow.bg", bg);
     evas_object_show(layout);
-    evas_object_show(conform);
+    //evas_object_show(conform);
 
     //ad->conformant = conform;
     return layout;