Fix unexpected cursor issue on password field

 - This patch is for TSAM-8492 / TSAM-8448

Change-Id: I04a4d81f44fd458418b1c0496524c66e81aad5a2
Signed-off-by: Jiwan Kim <ji-wan.kim@samsung.com>

diff --git a/src/layout/layout_network.c b/src/layout/layout_network.c
index 25f5e6a..3d01be4 100644 (file)
--- a/src/layout/layout_network.c
+++ b/src/layout/layout_network.c
@@ -705,7 +705,7 @@ static void _popup_entry_key_down_cb(void *data, Evas *e, Evas_Object *obj, void
 
        if (!strcmp(ev->keyname, KEY_ENTER)) {
                elm_object_focus_set(priv->popup_btn2, EINA_TRUE);
-       } else if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
+       } else if (!strcmp(ev->keyname, KEY_BACK)
                        || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY)
                ) {
                elm_object_focus_set(priv->popup_btn1, EINA_TRUE);
@@ -756,6 +756,7 @@ static void _remove_wifi_passcode_popup(struct _priv *priv)
 
        priv->popup_btn1 = NULL;
        priv->popup_btn2 = NULL;
+       evas_object_del(priv->passcode_entry);
        priv->passcode_entry = NULL;
 
        evas_object_del(priv->passcode_popup);
@@ -765,6 +766,7 @@ static void _remove_wifi_passcode_popup(struct _priv *priv)
 static bool _draw_wifi_passcode_popup(struct _priv *priv, char *wifi_name)
 {
        Evas_Object *popup, *ly, *entry, *btn1, *btn2;
+       Evas_Object *scroller;
 
        if (priv->passcode_popup) {
                _ERR("Already popup exists");
@@ -788,16 +790,17 @@ static bool _draw_wifi_passcode_popup(struct _priv *priv, char *wifi_name)
        elm_object_part_text_set(ly, PART_WIFI_NAME, wifi_name);
        evas_object_show(ly);
 
-       entry = utils_add_entry(ly, PART_WIFI_PASSCODE,
-                       STYLE_ENTRY_PASSCODE_TXT, EINA_TRUE);
+       scroller = elm_scroller_add(ly);
+       evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       elm_object_part_content_set(ly, PART_WIFI_PASSCODE, scroller);
+
+       entry = utils_add_entry(ly, NULL, STYLE_ENTRY_PASSCODE_TXT, EINA_TRUE);
        if (!entry) {
                _ERR("Add entry failed.");
                evas_object_del(popup);
                return false;
        }
-       elm_entry_scrollable_set(entry, EINA_TRUE);
-       evas_object_size_hint_weight_set(entry, EVAS_HINT_FILL, EVAS_HINT_EXPAND);
-       elm_scroller_policy_set(entry, ELM_SCROLLER_POLICY_AUTO, ELM_SCROLLER_POLICY_OFF);
+       elm_object_content_set(scroller, entry);
 
        elm_object_content_set(popup, ly);