Refactor request_fullscreen() to be an argument on request_size()

1 files changed, 6 insertions, 10 deletions

diff --git a/src/window/mapped.rs b/src/window/mapped.rs
index 16dfc4d4..9c4670dd 100644
--- a/src/window/mapped.rs
+++ b/src/window/mapped.rs
@@ -604,13 +604,18 @@ impl LayoutElement for Mapped {
     fn request_size(
         &mut self,
         size: Size<i32, Logical>,
+        is_fullscreen: bool,
         animate: bool,
         transaction: Option<Transaction>,
     ) {
         let changed = self.toplevel().with_pending_state(|state| {
             let changed = state.size != Some(size);
             state.size = Some(size);
-            state.states.unset(xdg_toplevel::State::Fullscreen);
+            if is_fullscreen {
+                state.states.set(xdg_toplevel::State::Fullscreen);
+            } else {
+                state.states.unset(xdg_toplevel::State::Fullscreen);
+            }
             changed
         });
 
@@ -693,15 +698,6 @@ impl LayoutElement for Mapped {
         self.request_size_once = Some(RequestSizeOnce::WaitingForConfigure);
     }
 
-    fn request_fullscreen(&mut self, size: Size<i32, Logical>) {
-        self.toplevel().with_pending_state(|state| {
-            state.size = Some(size);
-            state.states.set(xdg_toplevel::State::Fullscreen);
-        });
-
-        self.request_size_once = None;
-    }
-
     fn min_size(&self) -> Size<i32, Logical> {
         let min_size = with_states(self.toplevel().wl_surface(), |state| {
             let mut guard = state.cached_state.get::<SurfaceCachedState>();