Fix sys popup height size and style

Change-Id: Ia227888d00a55089e82bc10e3830f69ce0a66bbe
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 820405d..d968086 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
-Version:    0.5.2_35
+Version:    0.5.2_36
 Release:    1
 Group:      App/Network
 License:    Flora License

diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c
index 2df16ed..2aa9583 100644 (file)
--- a/sources/libraries/Common/common_eap_connect.c
+++ b/sources/libraries/Common/common_eap_connect.c
@@ -1277,7 +1277,7 @@ eap_connect_data_t *create_eap_popup(Evas_Object *win_main,
        wlan_manager_disable_scan_result_update();
 
        eap_data->popup = popup = elm_popup_add(win_main);
-       elm_object_style_set(popup, "min_menustyle");
+       elm_object_style_set(popup, "content_no_vhpad");
        elm_object_part_text_set(popup, "title,text", device_info->ssid);
        evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(popup, EVAS_HINT_FILL, EVAS_HINT_FILL);

diff --git a/sources/libraries/Common/include/common.h b/sources/libraries/Common/include/common.h
index 545530e..408150f 100644 (file)
--- a/sources/libraries/Common/include/common.h
+++ b/sources/libraries/Common/include/common.h
@@ -62,7 +62,7 @@ extern "C"
 #define INVALID_PASSWORD                               "Your password might be invalid"
 
 /* Syspopup height for portrait mode*/
-#define DEVICE_PICKER_POPUP_H          880
+#define DEVICE_PICKER_POPUP_H          530
 
 /* Syspopup height for landscape mode */
 #define DEVICE_PICKER_POPUP_LN_H               480

diff --git a/sources/libraries/appcoreWrapper/appcoreWrapper.c b/sources/libraries/appcoreWrapper/appcoreWrapper.c
index 13b6c20..bf94216 100644 (file)
--- a/sources/libraries/appcoreWrapper/appcoreWrapper.c
+++ b/sources/libraries/appcoreWrapper/appcoreWrapper.c
@@ -34,7 +34,7 @@ Evas_Object* appcore_create_win(const char *name)
        Evas_Object *eo;
        int w, h;
 
-       eo = elm_win_add(NULL, name, ELM_WIN_BASIC);
+       eo = elm_win_add(NULL, name, ELM_WIN_DIALOG_BASIC);
        if (eo) {
                elm_win_title_set(eo, name);
                elm_win_borderless_set(eo, EINA_TRUE);

diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/sources/wifi-syspopup/viewer-popups/view-main.c
index d484276..b074079 100644 (file)
--- a/sources/wifi-syspopup/viewer-popups/view-main.c
+++ b/sources/wifi-syspopup/viewer-popups/view-main.c
@@ -554,11 +554,11 @@ gboolean view_main_show(void *data)
        view_main_state_set(ITEM_CONNECTION_MODE_OFF);
 
        int state = wlan_manager_state_get();
-       if (WLAN_MANAGER_ERROR == state || WLAN_MANAGER_OFF == state) {
+
+       if (WLAN_MANAGER_ERROR == state || WLAN_MANAGER_OFF == state)
                return FALSE;
-       }
 
-       itc.item_style = "2text.2icon.4";
+       itc.item_style = "2text.2icon.4/popup";
        itc.func.text_get = _gl_text_get;
        itc.func.content_get = _gl_content_get;
        itc.func.state_get = NULL;

diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c
index 8485820..041b624 100644 (file)
--- a/sources/wifi-syspopup/wifi-syspopup.c
+++ b/sources/wifi-syspopup/wifi-syspopup.c
@@ -37,7 +37,7 @@
 #include "appcoreWrapper.h"
 #include "wifi-syspopup-engine-callback.h"
 
-#define POPUP_HEAD_AREA 134
+#define POPUP_HEAD_AREA 160
 #define POPUP_BUTTON_AREA 200
 #define MAX_INITIAL_QS_POPUP_LIST_SIZE 8
 
@@ -276,7 +276,7 @@ static int wifi_syspopup_create(void)
 
        evas_object_event_callback_add(syspopup_app_state->syspopup, EVAS_CALLBACK_KEY_DOWN, __keydown_cb, NULL);
 
-       elm_object_style_set(syspopup_app_state->syspopup,"min_menustyle");
+       elm_object_style_set(syspopup_app_state->syspopup,"content_no_vhpad");
        elm_object_part_text_set(syspopup_app_state->syspopup, "title,text", sc(PACKAGE, I18N_TYPE_WiFi_network));
        evas_object_size_hint_weight_set(syspopup_app_state->syspopup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);