discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=7f20ff52c9b51f8dc5a9c2bdba52d2622d9759a8

commit 7f20ff52c9b51f8dc5a9c2bdba52d2622d9759a8
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Fri Apr 1 06:56:47 2016 -0400

    reapply client focus after input grab, only handle focus for wayland 
compositors
    
    this was looking too weird
    
    ref 4a73e9f29ac5a3bafdff8d05c2f544ab47d4000b
---
 src/bin/e_comp.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 79ffe83..7c1fe65 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1653,11 +1653,22 @@ e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd)
    if ((e_comp->input_mouse_grabs && e_comp->input_key_grabs) ||
        e_grabinput_get(mwin, 0, kwin))
      {
-        if (e_client_focused_get())
-          evas_object_focus_set(e_client_focused_get()->frame, 0);
+        E_Client *ec = e_client_focused_get();
+
+        if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+          {
+             if (ec)
+               evas_object_focus_set(ec->frame, 0);
+          }
+
         ret = EINA_TRUE;
         e_comp->input_mouse_grabs += mouse;
         e_comp->input_key_grabs += kbd;
+        if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
+          {
+             if (ec)
+               evas_object_focus_set(ec->frame, 1);
+          }
      }
    return ret;
 }

-- 


Reply via email to