From 8701c9b1eab9502841e23f17e1cce4309ae9c665 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Tue, 9 Jan 2018 15:48:32 +0900 Subject: [PATCH] naviframe: Move focus from last content to first content by focus next Previously, if naviframe focus reaches to the last content, then the next focus goes to naviframe itself and focus remains the last content. Now, if naviframe focus reaches to the last content, then the next focus goes to the first content. Change-Id: I2bac890cd5953bfe77fee47044b2f86ce7d4c148 --- src/lib/elc_naviframe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c index 1222279..0fd6831 100644 --- a/src/lib/elc_naviframe.c +++ b/src/lib/elc_naviframe.c @@ -1555,7 +1555,8 @@ _elm_naviframe_elm_widget_focus_next(Eo *obj, Elm_Naviframe_Data *sd EINA_UNUSED eina_list_free(l); end: - if (!int_ret) + if (!int_ret && + (!(*next) || (*next == elm_object_focused_object_get(obj)))) { *next = obj; int_ret = !elm_widget_focus_get(obj); -- 2.7.4