From 9dee41f1a32aab8592f40f218994ff510fddfc4d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 20 Feb 2015 09:55:20 -0500 Subject: [PATCH] do not reapply focus on canvas object ungrab/close for pointer-focus enthusiasts --- src/bin/e_comp.c | 3 ++- src/bin/e_comp_object.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index ff4fff0d4..74cb15c76 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1587,7 +1587,8 @@ e_comp_ungrab_input(E_Comp *c, Eina_Bool mouse, Eina_Bool kbd) evas_event_feed_mouse_out(c->evas, 0, NULL); evas_event_feed_mouse_in(c->evas, 0, NULL); if (e_client_focused_get()) return; - e_client_refocus(); + if (e_config->focus_policy != E_FOCUS_MOUSE) + e_client_refocus(); } EAPI void diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 700b6c52f..fea2f81b1 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3696,7 +3696,8 @@ _e_comp_object_autoclose_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, evas_object_event_callback_del(obj, EVAS_CALLBACK_SHOW, _e_comp_object_autoclose_show); _e_comp_object_autoclose_cleanup(data, 1); if (e_client_focused_get()) return; - e_client_refocus(); + if (e_config->focus_policy != E_FOCUS_MOUSE) + e_client_refocus(); } EAPI void