WindowSwitcher: Improve mouse handling (#1836)

elementary · Jan 28, 2024 · c25770e · c25770e
1 parent 6e50184
commit c25770e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 31 deletions.
diff --git a/src/Widgets/WindowSwitcher/WindowSwitcher.vala b/src/Widgets/WindowSwitcher/WindowSwitcher.vala
@@ -155,7 +155,6 @@ public class Gala.WindowSwitcher : Clutter.Actor {
         };
 
         container.button_release_event.connect (container_mouse_release);
-        container.motion_event.connect (container_motion_event);
 
         var caption_color = "#2e2e31";
 
@@ -292,7 +291,7 @@ public class Gala.WindowSwitcher : Clutter.Actor {
                 current_icon = icon;
             }
 
-            container.add_child (icon);
+            add_icon (icon);
         }
 
         return true;
@@ -322,13 +321,25 @@ public class Gala.WindowSwitcher : Clutter.Actor {
                     current_icon = icon;
                 }
 
-                container.add_child (icon);
+                add_icon (icon);
             }
         }
 
         return true;
     }
 
+    private void add_icon (WindowSwitcherIcon icon) {
+        container.add_child (icon);
+
+        icon.motion_event.connect (() => {
+            if (current_icon != icon && !handling_gesture) {
+                current_icon = icon;
+            }
+
+            return Clutter.EVENT_PROPAGATE;
+        });
+    }
+
     private void open_switcher () {
         if (container.get_n_children () == 0) {
             Clutter.get_default_backend ().get_default_seat ().bell_notify ();
@@ -484,34 +495,6 @@ public class Gala.WindowSwitcher : Clutter.Actor {
         }
     }
 
-#if HAS_MUTTER45
-    private bool container_motion_event (Clutter.Event event) {
-#else
-    private bool container_motion_event (Clutter.MotionEvent event) {
-#endif
-        if (handling_gesture) {
-            return Clutter.EVENT_STOP;
-        }
-
-        float x, y;
-        event.get_coords (out x, out y);
-        var actor = container.get_stage ().get_actor_at_pos (Clutter.PickMode.ALL, (int)x, (int)y);
-        if (actor == null) {
-            return Clutter.EVENT_STOP;
-        }
-
-        var selected = actor as WindowSwitcherIcon;
-        if (selected == null) {
-            return Clutter.EVENT_STOP;
-        }
-
-        if (current_icon != selected) {
-            current_icon = selected;
-        }
-
-        return true;
-    }
-
 #if HAS_MUTTER45
     private bool container_mouse_release (Clutter.Event event) {
 #else

diff --git a/src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala b/src/Widgets/WindowSwitcher/WindowSwitcherIcon.vala
@@ -47,6 +47,8 @@ public class Gala.WindowSwitcherIcon : Clutter.Actor {
         canvas.draw.connect (draw_background);
         set_content (canvas);
 
+        reactive = true;
+
         this.scale_factor = scale_factor;
     }