From bd5bf5e719e738945936638b27ca52fbe45a055f Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Wed, 21 Dec 2016 13:06:54 +0100 Subject: [PATCH] efl_ui_flip: migrate to new focus system --- src/lib/elementary/efl_ui_flip.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/lib/elementary/efl_ui_flip.c b/src/lib/elementary/efl_ui_flip.c index 5e69761..fc8c3d7 100644 --- a/src/lib/elementary/efl_ui_flip.c +++ b/src/lib/elementary/efl_ui_flip.c @@ -1792,6 +1792,8 @@ _flip_content_set(Evas_Object *obj, //evas_object_smart_member_add(content, obj); evas_object_clip_set (content, front ? sd->front.clip : sd->back.clip); + if (efl_isa(content, ELM_WIDGET_CLASS) && sd->state != front) + elm_widget_tree_unfocusable_set(content, EINA_TRUE); } // force calc to contents are the right size before transition @@ -2012,6 +2014,13 @@ _internal_elm_flip_go_to(Evas_Object *obj, if (front) elm_object_focus_set(sd->front.content, EINA_TRUE); else elm_object_focus_set(sd->back.content, EINA_TRUE); } + + if (sd->front.content && efl_isa(sd->front.content, ELM_WIDGET_CLASS)) + elm_widget_tree_unfocusable_set(sd->front.content, !front); + if (sd->back.content && efl_isa(sd->back.content, ELM_WIDGET_CLASS)) + elm_widget_tree_unfocusable_set(sd->back.content, front); + + } EOLIAN static void -- 2.7.4