From 9de4ec15580bf44d3ae9fb59b37ef30c3b18f4a9 Mon Sep 17 00:00:00 2001 From: WooHyun Jung Date: Mon, 12 Mar 2012 02:10:52 +0000 Subject: [PATCH] elementary/naviframe : Fix some focus issues. When pushing an item, prev_it->content should be set as unfocusable. And when popping, current content which will not be preserved should be set as unfocusable. SVN revision: 69215 --- legacy/elementary/src/lib/elc_naviframe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c index bfe2543e39..fc83c4f430 100644 --- a/legacy/elementary/src/lib/elc_naviframe.c +++ b/legacy/elementary/src/lib/elc_naviframe.c @@ -1141,7 +1141,7 @@ elm_naviframe_item_push(Evas_Object *obj, elm_object_signal_emit(VIEW(prev_it), "elm,state,cur,pushed", "elm"); elm_object_signal_emit(VIEW(it), "elm,state,new,pushed", "elm"); edje_object_message_signal_process(elm_layout_edje_get(VIEW(prev_it))); - elm_widget_tree_unfocusable_set(it->content, EINA_TRUE); + elm_widget_tree_unfocusable_set(prev_it->content, EINA_TRUE); edje_object_message_signal_process(elm_layout_edje_get(VIEW(it))); } wd->stack = eina_inlist_append(wd->stack, EINA_INLIST_GET(it)); @@ -1227,6 +1227,8 @@ elm_naviframe_item_pop(Evas_Object *obj) if (!it) return NULL; if (wd->preserve) content = it->content; + else + elm_widget_tree_unfocusable_set(it->content, EINA_TRUE); if (wd->stack->last->prev) prev_it = EINA_INLIST_CONTAINER_GET(wd->stack->last->prev,