From 3b0af184cf784703f286004d67e1c2150690f54f Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Sun, 11 Jan 2015 15:18:02 -0500 Subject: [PATCH] fake win should not perform widget focus setting on canvas focus-in --- src/lib/elm_win.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 91ea90b..43dfeba 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -1012,13 +1012,16 @@ _elm_win_focus_in(Ecore_Evas *ee) obj = sd->obj; _elm_widget_top_win_focused_set(obj, EINA_TRUE); - if (!elm_widget_focus_order_get(obj) - || (obj == elm_widget_newest_focus_order_get(obj, &order, EINA_TRUE))) + if (sd->type != ELM_WIN_FAKE) { - elm_widget_focus_steal(obj); + if (!elm_widget_focus_order_get(obj) + || (obj == elm_widget_newest_focus_order_get(obj, &order, EINA_TRUE))) + { + elm_widget_focus_steal(obj); + } + else + elm_widget_focus_restore(obj); } - else - elm_widget_focus_restore(obj); evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL); sd->focus_highlight.cur.visible = EINA_TRUE; _elm_win_focus_highlight_reconfigure_job_start(sd); -- 2.7.4