aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/elementary/src/lib/elm_win.c
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
commit65db0dc1cdbc3ed5addd4eed5b1e6eaaf004850f (patch)
tree00eb9ddea0d347b40748aad930a868f4a76cc661 /legacy/elementary/src/lib/elm_win.c
parentRevert "genlist: use eina bool" (diff)
downloadefl-65db0dc1cdbc3ed5addd4eed5b1e6eaaf004850f.tar.gz
fake win should not perform widget focus setting on canvas focus-in
Diffstat (limited to 'legacy/elementary/src/lib/elm_win.c')
-rw-r--r--legacy/elementary/src/lib/elm_win.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 91ea90b1e0..43dfeba6e3 100644
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/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);