[Fix] Focus works properly in Reset Popup now

Change-Id: I45219245706d9472ba9a76eca35a46c6c5b7644b
Signed-off-by: Pawel Aksiutowicz <p.aksiutowic@partner.samsung.com>

diff --git a/src/view/system/view_reset.c b/src/view/system/view_reset.c
index 66eb708..bfacdd0 100644 (file)
--- a/src/view/system/view_reset.c
+++ b/src/view/system/view_reset.c
@@ -102,6 +102,13 @@ static Evas_Object *_create(Evas_Object *win, void *data)
        inputmgr_add_callback(priv->reset_btn, 0, &reset_btn_handler, priv);
        inputmgr_add_callback(priv->cancel_btn, 1, &cancel_btn_handler, priv);
 
+       utils_set_obj_focus(priv->reset_btn, priv->reset_btn, priv->cancel_btn,
+                       priv->reset_btn, priv->reset_btn, priv->cancel_btn,
+                       priv->reset_btn, false);
+       utils_set_obj_focus(priv->cancel_btn, priv->reset_btn, priv->cancel_btn,
+                       priv->cancel_btn, priv->cancel_btn, priv->cancel_btn,
+                       priv->reset_btn, false);
+
        if (!viewmgr_set_view_data(VIEW_RESET, priv)) {
                _ERR("Set view data failed.");
                evas_object_del(priv->popup);
@@ -124,8 +131,8 @@ static void _show(void *data)
        }
 
        elm_popup_allow_events_set(priv->popup, EINA_FALSE);
-       elm_object_focus_set(priv->cancel_btn, EINA_TRUE);
        evas_object_show(priv->popup);
+       elm_object_focus_set(priv->cancel_btn, EINA_TRUE);
 }
 
 static void _hide(void *data)
@@ -185,6 +192,6 @@ static void _button_key_cb(int id, void *data, Evas *e, Evas_Object *obj,
                return;
 
        if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_WAY)
-                       || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY))
+               || !strcmp(ev->keyname, KEY_ESC) || !strcmp(ev->keyname, KEY_ESC_WAY))
                viewmgr_pop_view();
 }