From 7988be12a500bdaf822a693538ac0309fd1bc299 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Thu, 3 Jul 2025 17:42:06 +0200
Subject: [PATCH] shell: rebase fullscreen changes on for xwayland-grab

---
 src/shell/mod.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 97b07883..4d6586fd 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -1680,6 +1680,12 @@ impl Shell {
         } else if let KeyboardFocusTarget::XWaylandGrab(surface) = &focus_target {
             if let Some(new_target) = self.element_for_surface(surface) {
                 focus_target = KeyboardFocusTarget::Element(new_target.clone());
+            } else if let Some(new_target) = self
+                .workspaces
+                .spaces()
+                .find_map(|w| w.get_fullscreen().filter(|s| *s == surface))
+            {
+                focus_target = KeyboardFocusTarget::Fullscreen(new_target.clone());
             } else if let Some(or) = self
                 .override_redirect_windows
                 .iter()