Fix password popup to show genlist

Change-Id: I32caed4793561ab7c83b24ab0a00f827c97a6cc9
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>

diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec
index 3838dbf..dbb9f14 100644 (file)
--- a/packaging/wifi-efl-ug.spec
+++ b/packaging/wifi-efl-ug.spec
@@ -1,7 +1,7 @@
 %define _unpackaged_files_terminate_build 0
 Name:          wifi-efl-ug
 Summary:       Wi-Fi UI Gadget for TIZEN
-Version:       1.0.151
+Version:       1.0.152
 Release:       1
 Group:         App/Network
 License:       Flora-1.1

diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c
index b65fad0..c548953 100755 (executable)
--- a/sources/libraries/Common/common_eap_connect.c
+++ b/sources/libraries/Common/common_eap_connect.c
@@ -1628,6 +1628,7 @@ static Evas_Object* _create_list(Evas_Object* parent, void *data)
        /* Create the entry items */
        _create_and_update_list_items_based_on_rules(eap_type, eap_data);
 
+       evas_object_show(view_list);
        evas_object_smart_callback_add(view_list, "language,changed",
                        gl_lang_changed, NULL);
 
@@ -1913,6 +1914,7 @@ eap_connect_data_t *create_eap_view(Evas_Object *layout_main, Evas_Object *win,
 
        Evas_Object *popup = NULL;
        Evas_Object *list = NULL;
+       Evas_Object *box = NULL;
 
        if (layout_main == NULL || device_info == NULL || pkg_name == NULL) {
                return NULL;
@@ -1974,9 +1976,16 @@ eap_connect_data_t *create_eap_view(Evas_Object *layout_main, Evas_Object *win,
        evas_object_show(popup);
        elm_object_focus_set(popup, EINA_TRUE);
 
+       box = elm_box_add(popup);
+       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
        /* Create an EAP connect view list */
-       list = _create_list(popup, eap_data);
-       elm_object_content_set(popup, list);
+       list = _create_list(box, eap_data);
+       elm_object_content_set(box, list);
+
+       elm_box_pack_end(box, list);
+       evas_object_size_hint_min_set(box, -1, ELM_SCALE_SIZE(300));
+       elm_object_content_set(popup, box);
 
        evas_object_smart_callback_add(eap_data->conf,
                        "virtualkeypad,state,on", _eap_popup_keypad_on_cb,

diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c
index 0e36fdc..2fd850b 100755 (executable)
--- a/sources/libraries/Common/common_pswd_popup.c
+++ b/sources/libraries/Common/common_pswd_popup.c
@@ -654,6 +654,7 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main,
        Evas_Object *passpopup = NULL;
        Evas_Object *genlist = NULL;
        Evas_Object *btn_ok = NULL;
+       Evas_Object *box = NULL;
 
        __COMMON_FUNC_ENTER__;
 
@@ -717,7 +718,10 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main,
        elm_access_info_set(ao, ELM_ACCESS_INFO, popup_info->title);
 #endif
 
-       genlist = elm_genlist_add(passpopup);
+       box = elm_box_add(passpopup);
+       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+
+       genlist = elm_genlist_add(box);
        elm_genlist_mode_set(genlist, ELM_LIST_COMPRESS);
        elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE);
        evas_object_size_hint_weight_set(genlist,
@@ -760,8 +764,9 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main,
        }
 
        evas_object_show(genlist);
-
-       elm_object_content_set(passpopup, genlist);
+       elm_box_pack_end(box, genlist);
+       evas_object_size_hint_min_set(box, -1, ELM_SCALE_SIZE(100));
+       elm_object_content_set(passpopup, box);
 
        evas_object_smart_callback_add(passpopup, "show,finished",
                        popup_animation_finish_cb, entry_item);