summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-01-11 15:18:02 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-01-11 15:18:27 -0500
commit3b0af184cf784703f286004d67e1c2150690f54f (patch)
tree77f3b966d0c72621a945d805d3be47fc7fbe3a7a
parent8ac832ffdf974bd91d3b013e00eaafbcc87f25f6 (diff)
fake win should not perform widget focus setting on canvas focus-in
-rw-r--r--src/lib/elm_win.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 91ea90b1e..43dfeba6e 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1012,13 +1012,16 @@ _elm_win_focus_in(Ecore_Evas *ee)
1012 obj = sd->obj; 1012 obj = sd->obj;
1013 1013
1014 _elm_widget_top_win_focused_set(obj, EINA_TRUE); 1014 _elm_widget_top_win_focused_set(obj, EINA_TRUE);
1015 if (!elm_widget_focus_order_get(obj) 1015 if (sd->type != ELM_WIN_FAKE)
1016 || (obj == elm_widget_newest_focus_order_get(obj, &order, EINA_TRUE)))
1017 { 1016 {
1018 elm_widget_focus_steal(obj); 1017 if (!elm_widget_focus_order_get(obj)
1018 || (obj == elm_widget_newest_focus_order_get(obj, &order, EINA_TRUE)))
1019 {
1020 elm_widget_focus_steal(obj);
1021 }
1022 else
1023 elm_widget_focus_restore(obj);
1019 } 1024 }
1020 else
1021 elm_widget_focus_restore(obj);
1022 evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL); 1025 evas_object_smart_callback_call(obj, SIG_FOCUS_IN, NULL);
1023 sd->focus_highlight.cur.visible = EINA_TRUE; 1026 sd->focus_highlight.cur.visible = EINA_TRUE;
1024 _elm_win_focus_highlight_reconfigure_job_start(sd); 1027 _elm_win_focus_highlight_reconfigure_job_start(sd);