TizenRefApp-7311 Keyboard isn't closed, after tapping back button, when open pop...

Change-Id: Iec5e51c4ece0149c4574edf3b71cb561f4c587cf
Signed-off-by: Andriy Kolesnichenko <a.kolesniche@samsung.com>

diff --git a/modules/account/src/email-account-folder.c b/modules/account/src/email-account-folder.c
index 31fede9..8724497 100644 (file)
--- a/modules/account/src/email-account-folder.c
+++ b/modules/account/src/email-account-folder.c
@@ -1860,10 +1860,7 @@ static void _rename_folder_cancel_cb(void *data, Evas_Object *obj, void *event_i
 
        EmailAccountView *view = (EmailAccountView *) data;
 
-       if (view->popup) {
-               evas_object_del(view->popup);
-               view->popup = NULL;
-       }
+       DELETE_EVAS_OBJECT(view->popup);
        view->it = NULL;
        view->editmode = false;
 
@@ -1889,10 +1886,8 @@ static void _rename_folder_ok_cb(void *data, Evas_Object *obj, void *event_info)
        char *mailbox_alias;
 
        bool generate_result = _generate_email_name_and_alias(view, &mailbox_name, &mailbox_alias);
-       if (view->popup) {
-               evas_object_del(view->popup);
-               view->popup = NULL;
-       }
+       DELETE_EVAS_OBJECT(view->popup);
+
        if (!generate_result) {
                debug_log("generating email and alias error occured");
                return;
@@ -1940,10 +1935,8 @@ static void _create_folder_ok_cb(void *data, Evas_Object *obj, void *event_info)
        char *mailbox_name;
        char *mailbox_alias;
        bool generate_result = _generate_email_name_and_alias(view, &mailbox_name, &mailbox_alias);
-       if (view->popup) {
-               evas_object_del(view->popup);
-               view->popup = NULL;
-       }
+       DELETE_EVAS_OBJECT(view->popup);
+
        if (!generate_result) {
                debug_log("generating email and alias error occured");
                return;
@@ -1990,10 +1983,7 @@ static void _create_folder_popup_cancel_cb(void *data, Evas_Object *obj, void *e
 
        EmailAccountView *view = (EmailAccountView *) data;
 
-       if (view->popup) {
-               evas_object_del(view->popup);
-               view->popup = NULL;
-       }
+       DELETE_EVAS_OBJECT(view->popup);
        view->it = NULL;
        view->target_mailbox_id = -1;
        view->editmode = false;

diff --git a/modules/account/src/email-account-util.c b/modules/account/src/email-account-util.c
index 38d0940..054b1a2 100644 (file)
--- a/modules/account/src/email-account-util.c
+++ b/modules/account/src/email-account-util.c
@@ -764,6 +764,8 @@ static void _entry_popup_del_cb(void *data, Evas *evas, Evas_Object *obj, void *
 
        DELETE_IDLER_OBJECT(view->popup_focus_idler);
 
+       elm_entry_input_panel_hide(view->entry);
+
        view->entry = NULL;
        view->popup_ok_btn = NULL;