In keyboard_leave, ignore event for unrecognized wl_surface

Do nothing here if the surface belongs to a different panel.

Author: ids1024

cosmic-panel-bin/src/space/wrapper_space.rs

@@ -1393,16 +1393,28 @@ impl WrapperSpace for PanelSpace {
     }
 
     fn keyboard_leave(&mut self, seat_name: &str, f: Option<c_wl_surface::WlSurface>) {
-        // if not a leaf, return early
         if let Some(surface) = f.as_ref() {
+            // if not a leaf, return early
             if self.popups.iter().any(|p| p.popup.parent == *surface) {
                 return;
             }
-        }
-        if self.layer.as_ref().zip(f).is_some_and(|l| l.0.wl_surface() == &l.1)
-            && (self.popups.iter().any(|p| p.popup.grab) || self.overflow_popup.is_some())
-        {
-            return;
+
+            if self.layer.as_ref().is_some_and(|l| l.wl_surface() == surface)
+                && (self.popups.iter().any(|p| p.popup.grab) || self.overflow_popup.is_some())
+            {
+                return;
+            }
+
+            // Ignore event for wl_surface that isn't our layer or popup (i.e. a different panel)
+            if !self.layer.as_ref().is_some_and(|l| l.wl_surface() == surface)
+                && !self
+                    .overflow_popup
+                    .as_ref()
+                    .is_some_and(|(p, _)| p.c_popup.wl_surface() == surface)
+                && !self.popups.iter().any(|p| p.popup.c_popup.wl_surface() == surface)
+            {
+                return;
+            }
         }
 
         self.s_focused_surface.retain(|(_, name)| name != seat_name);