Change parent object of popup

[problem] outside of keypad couldn't resize when keypad is enabled.
[cause] elm_win has been used as parent object for popup since tizen 6.0.

Change-Id: I660a40bede56d65867fc4c2dc5db670bed602977

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 0aad622..e4c8617 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,6 +1,6 @@
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.242
+Version:       1.0.243
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c
index 46ad46d..5bfa830 100755 (executable)
--- a/sources/ui-gadget/viewers-layout/viewer_manager.c
+++ b/sources/ui-gadget/viewers-layout/viewer_manager.c
@@ -2202,8 +2202,11 @@ void viewer_manager_specific_scan_response_hlr(
                        device_info.security_mode = WIFI_MANAGER_SECURITY_TYPE_EAP;
                        device_info.ssid = (char *)ssid;
                        device_info.ap = ap;
+
+                       UG_TYPE ug_type = wifi_get_ug_type();
                        ug_app_state->eap_view =
-                                       create_eap_view(ug_app_state->parent_layout,
+                                       create_eap_view(ug_type == UG_VIEW_OOBE ?
+                                                       ug_app_state->parent_layout : ug_app_state->layout_main,
                                                        ugd->win_main,
                                                        ug_app_state->conformant,
                                                        PACKAGE, &device_info,

diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c
index 1053f9f..eab63dc 100755 (executable)
--- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c
+++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c
@@ -612,6 +612,7 @@ void viewer_list_wifi_reconnect(wifi_device_info_t *device_info)
        wifi_manager_security_type_e sec_type = WIFI_MANAGER_SECURITY_TYPE_NONE;
        wifi_device_info_t *device_info_temp = NULL;
        struct ug_data *ugd = (struct ug_data *)ug_app_state->gadget;
+       UG_TYPE ug_type = wifi_get_ug_type();
 
        if (device_info == NULL)
                return;
@@ -647,7 +648,9 @@ void viewer_list_wifi_reconnect(wifi_device_info_t *device_info)
                /* TODO: finally parameter with wifi_manager_ap_h, WPA, EAP */
                ug_app_state->passpopup = create_passwd_popup(
                                ug_app_state->conformant,
-                               ug_app_state->parent_layout, PACKAGE, &popup_info);
+                               ug_type == UG_VIEW_OOBE ?
+                               ug_app_state->parent_layout : ug_app_state->layout_main,
+                               PACKAGE, &popup_info);
 
                if (ug_app_state->passpopup == NULL)
                        INFO_LOG(UG_NAME_ERR, "Fail to create password popup");
@@ -656,7 +659,9 @@ void viewer_list_wifi_reconnect(wifi_device_info_t *device_info)
                break;
        case WIFI_MANAGER_SECURITY_TYPE_EAP:
                ug_app_state->eap_view = create_eap_view(
-                               ug_app_state->parent_layout, ugd->win_main,
+                               ug_type == UG_VIEW_OOBE ?
+                               ug_app_state->parent_layout : ug_app_state->layout_main,
+                               ugd->win_main,
                                ug_app_state->conformant,
                                PACKAGE, device_info,
                                viewer_manager_eap_view_deref);
@@ -675,6 +680,7 @@ void viewer_list_wifi_connect(wifi_device_info_t *device_info)
        wifi_manager_security_type_e sec_type = WIFI_MANAGER_SECURITY_TYPE_NONE;
        wifi_device_info_t *dev_info_temp = NULL;
        struct ug_data *ugd = (struct ug_data *)ug_app_state->gadget;
+       UG_TYPE ug_type = wifi_get_ug_type();
 
        if (device_info == NULL)
                return;
@@ -729,7 +735,8 @@ void viewer_list_wifi_connect(wifi_device_info_t *device_info)
                /* TODO: finally parameter with wifi_manager_ap_h, WPA, EAP */
                ug_app_state->passpopup = create_passwd_popup(
                                ug_app_state->conformant,
-                               ug_app_state->parent_layout, PACKAGE, &popup_info);
+                               ug_type == UG_VIEW_OOBE ?
+                               ug_app_state->parent_layout : ug_app_state->layout_main, PACKAGE, &popup_info);
 
                if (ug_app_state->passpopup == NULL)
                        INFO_LOG(UG_NAME_ERR, "Fail to create password popup");
@@ -739,7 +746,9 @@ void viewer_list_wifi_connect(wifi_device_info_t *device_info)
 
        case WIFI_MANAGER_SECURITY_TYPE_EAP:
                ug_app_state->eap_view = create_eap_view(
-                               ug_app_state->parent_layout, ugd->win_main,
+                               ug_type == UG_VIEW_OOBE ?
+                               ug_app_state->parent_layout : ug_app_state->layout_main,
+                               ugd->win_main,
                                ug_app_state->conformant,
                                PACKAGE, device_info,
                                viewer_manager_eap_view_deref);
@@ -1379,7 +1388,10 @@ static void _hidden_network_cb(void* data, Evas_Object* obj, void* event_info)
 {
     __COMMON_FUNC_ENTER__;
 
-    view_hidden_ap_popup_create(ug_app_state->parent_layout, PACKAGE);
+       UG_TYPE ug_type = wifi_get_ug_type();
+    view_hidden_ap_popup_create(ug_type == UG_VIEW_OOBE ?
+                       ug_app_state->parent_layout : ug_app_state->layout_main,
+                       PACKAGE);
 
     __COMMON_FUNC_EXIT__;
 }