From 9823b42c20d4fa3f79c54b649af3b5a7c7ccfcc2 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Fri, 18 Nov 2022 13:35:36 +0100
Subject: [PATCH] Fix fullscreen window geometry

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

diff --git a/src/shell/element/mod.rs b/src/shell/element/mod.rs
index 590b3046..890ac9cd 100644
--- a/src/shell/element/mod.rs
+++ b/src/shell/element/mod.rs
@@ -236,7 +236,10 @@ impl CosmicMapped {
         };
 
         match window.toplevel() {
-            Kind::Xdg(xdg) => xdg.current_state().states.contains(XdgState::Resizing),
+            Kind::Xdg(xdg) => {
+                xdg.current_state().states.contains(XdgState::Resizing)
+                    || xdg.with_pending_state(|states| states.states.contains(XdgState::Resizing))
+            }
             // Kind::X11?
         }
     }
@@ -309,8 +312,10 @@ impl CosmicMapped {
         };
 
         match window.toplevel() {
-            Kind::Xdg(xdg) => xdg.current_state().states.contains(XdgState::Fullscreen),
-            // Kind::X11?
+            Kind::Xdg(xdg) => {
+                xdg.current_state().states.contains(XdgState::Fullscreen)
+                    || xdg.with_pending_state(|states| states.states.contains(XdgState::Fullscreen))
+            } // Kind::X11?
         }
     }
 
@@ -343,8 +348,10 @@ impl CosmicMapped {
         };
 
         match window.toplevel() {
-            Kind::Xdg(xdg) => xdg.current_state().states.contains(XdgState::Maximized),
-            // Kind::X11?
+            Kind::Xdg(xdg) => {
+                xdg.current_state().states.contains(XdgState::Maximized)
+                    || xdg.with_pending_state(|states| states.states.contains(XdgState::Maximized))
+            } // Kind::X11?
         }
     }
 
@@ -377,7 +384,10 @@ impl CosmicMapped {
         };
 
         match window.toplevel() {
-            Kind::Xdg(xdg) => xdg.current_state().states.contains(XdgState::Activated),
+            Kind::Xdg(xdg) => {
+                xdg.current_state().states.contains(XdgState::Activated)
+                    || xdg.with_pending_state(|states| states.states.contains(XdgState::Activated))
+            }
             // Kind::X11?
         }
     }