From 309bf1348c67a81b99e7b3feef461584ca7cd423 Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Mon, 23 Dec 2024 08:52:45 +0300
Subject: [PATCH] floating: Improve expected size requests to avoid (0, 0) and
 duplicates

---
 src/layout/floating.rs                        |  16 +-
 src/layout/mod.rs                             |  20 ++-
 src/tests/floating.rs                         | 152 +++++++++++++++++-
 ..._target_output_and_workspace@fsF-spB2.snap |   1 +
 ...t_output_and_workspace@fsF-wfsAA-spA1.snap |   2 +-
 ...t_output_and_workspace@fsF-wfsAA-spA2.snap |   2 +-
 ...t_output_and_workspace@fsF-wfsAA-spB1.snap |   2 +-
 ...t_output_and_workspace@fsF-wfsAA-spB2.snap |   1 +
 ...t_output_and_workspace@fsF-wfsB2-spB1.snap |   1 +
 ...t_output_and_workspace@fsF-wfsB2-spB2.snap |   1 +
 ...t_output_and_workspace@fsF-wfsBN-spB2.snap |   1 +
 ...t_output_and_workspace@fsF-wfsBU-spB2.snap |   1 +
 ...t_output_and_workspace@fsT-wfsAA-spA1.snap |   2 +-
 ...t_output_and_workspace@fsT-wfsAA-spA2.snap |   2 +-
 ...t_output_and_workspace@fsT-wfsAA-spB1.snap |   2 +-
 ...put_and_workspace@out1-fsF-wfsAA-spA1.snap |   2 +-
 ...put_and_workspace@out1-fsF-wfsAA-spA2.snap |   2 +-
 ...put_and_workspace@out1-fsF-wfsAA-spB1.snap |   2 +-
 ...put_and_workspace@out1-fsF-wfsAA-spB2.snap |   2 +-
 ...put_and_workspace@out1-fsT-wfsAA-spA1.snap |   2 +-
 ...put_and_workspace@out1-fsT-wfsAA-spA2.snap |   2 +-
 ...put_and_workspace@out1-fsT-wfsAA-spB1.snap |   2 +-
 ...put_and_workspace@out1-fsT-wfsAA-spB2.snap |   2 +-
 ..._output_and_workspace@out1-wfsAA-spA1.snap |   2 +-
 ..._output_and_workspace@out1-wfsAA-spA2.snap |   2 +-
 ..._output_and_workspace@out1-wfsAA-spB1.snap |   2 +-
 ..._output_and_workspace@out1-wfsAA-spB2.snap |   2 +-
 ...et_output_and_workspace@out2-fsF-spB1.snap |   1 +
 ...et_output_and_workspace@out2-fsF-spB2.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsAA-spB1.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsAA-spB2.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsB1-spB1.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsB1-spB2.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsB2-spB1.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsB2-spB2.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsBN-spB1.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsBN-spB2.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsBU-spB1.snap |   1 +
 ...put_and_workspace@out2-fsF-wfsBU-spB2.snap |   1 +
 ...target_output_and_workspace@out2-spB1.snap |   1 +
 ...target_output_and_workspace@out2-spB2.snap |   1 +
 ..._output_and_workspace@out2-wfsAA-spB1.snap |   1 +
 ..._output_and_workspace@out2-wfsAA-spB2.snap |   1 +
 ..._output_and_workspace@out2-wfsBU-spB1.snap |   1 +
 ..._output_and_workspace@out2-wfsBU-spB2.snap |   1 +
 ...heck_target_output_and_workspace@spB2.snap |   1 +
 ...arget_output_and_workspace@wfsAA-spA1.snap |   2 +-
 ...arget_output_and_workspace@wfsAA-spA2.snap |   2 +-
 ...arget_output_and_workspace@wfsAA-spB1.snap |   2 +-
 ...arget_output_and_workspace@wfsAA-spB2.snap |   1 +
 ...arget_output_and_workspace@wfsBU-spB2.snap |   1 +
 ...tput_and_workspace@ws1-fsF-wfsAA-spA1.snap |   2 +-
 ...tput_and_workspace@ws1-fsF-wfsAA-spA2.snap |   2 +-
 ...tput_and_workspace@ws1-fsF-wfsAA-spB1.snap |   2 +-
 ...tput_and_workspace@ws1-fsF-wfsAA-spB2.snap |   2 +-
 ...tput_and_workspace@ws1-fsT-wfsAA-spA1.snap |   2 +-
 ...tput_and_workspace@ws1-fsT-wfsAA-spA2.snap |   2 +-
 ...tput_and_workspace@ws1-fsT-wfsAA-spB1.snap |   2 +-
 ...tput_and_workspace@ws1-fsT-wfsAA-spB2.snap |   2 +-
 ...and_workspace@ws1-out1-fsF-wfsAA-spA1.snap |   2 +-
 ...and_workspace@ws1-out1-fsF-wfsAA-spA2.snap |   2 +-
 ...and_workspace@ws1-out1-fsF-wfsAA-spB1.snap |   2 +-
 ...and_workspace@ws1-out1-fsF-wfsAA-spB2.snap |   2 +-
 ...and_workspace@ws1-out1-fsT-wfsAA-spA1.snap |   2 +-
 ...and_workspace@ws1-out1-fsT-wfsAA-spA2.snap |   2 +-
 ...and_workspace@ws1-out1-fsT-wfsAA-spB1.snap |   2 +-
 ...and_workspace@ws1-out1-fsT-wfsAA-spB2.snap |   2 +-
 ...put_and_workspace@ws1-out1-wfsAA-spA1.snap |   2 +-
 ...put_and_workspace@ws1-out1-wfsAA-spA2.snap |   2 +-
 ...put_and_workspace@ws1-out1-wfsAA-spB1.snap |   2 +-
 ...put_and_workspace@ws1-out1-wfsAA-spB2.snap |   2 +-
 ...and_workspace@ws1-out2-fsF-wfsAA-spA1.snap |   2 +-
 ...and_workspace@ws1-out2-fsF-wfsAA-spA2.snap |   2 +-
 ...and_workspace@ws1-out2-fsF-wfsAA-spB1.snap |   2 +-
 ...and_workspace@ws1-out2-fsF-wfsAA-spB2.snap |   2 +-
 ...and_workspace@ws1-out2-fsT-wfsAA-spA1.snap |   2 +-
 ...and_workspace@ws1-out2-fsT-wfsAA-spA2.snap |   2 +-
 ...and_workspace@ws1-out2-fsT-wfsAA-spB1.snap |   2 +-
 ...and_workspace@ws1-out2-fsT-wfsAA-spB2.snap |   2 +-
 ...put_and_workspace@ws1-out2-wfsAA-spA1.snap |   2 +-
 ...put_and_workspace@ws1-out2-wfsAA-spA2.snap |   2 +-
 ...put_and_workspace@ws1-out2-wfsAA-spB1.snap |   2 +-
 ...put_and_workspace@ws1-out2-wfsAA-spB2.snap |   2 +-
 ...t_output_and_workspace@ws1-wfsAA-spA1.snap |   2 +-
 ...t_output_and_workspace@ws1-wfsAA-spA2.snap |   2 +-
 ...t_output_and_workspace@ws1-wfsAA-spB1.snap |   2 +-
 ...t_output_and_workspace@ws1-wfsAA-spB2.snap |   2 +-
 ...get_output_and_workspace@ws2-fsF-spB1.snap |   1 +
 ...get_output_and_workspace@ws2-fsF-spB2.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsAA-spB1.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsAA-spB2.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsB1-spB1.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsB1-spB2.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsB2-spB1.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsB2-spB2.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsBN-spB1.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsBN-spB2.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsBU-spB1.snap |   1 +
 ...tput_and_workspace@ws2-fsF-wfsBU-spB2.snap |   1 +
 ...utput_and_workspace@ws2-out1-fsF-spB1.snap |   1 +
 ...utput_and_workspace@ws2-out1-fsF-spB2.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsAA-spB1.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsAA-spB2.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsB1-spB1.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsB1-spB2.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsB2-spB1.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsB2-spB2.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsBN-spB1.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsBN-spB2.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsBU-spB1.snap |   1 +
 ...and_workspace@ws2-out1-fsF-wfsBU-spB2.snap |   1 +
 ...et_output_and_workspace@ws2-out1-spB1.snap |   1 +
 ...et_output_and_workspace@ws2-out1-spB2.snap |   1 +
 ...put_and_workspace@ws2-out1-wfsAA-spB1.snap |   1 +
 ...put_and_workspace@ws2-out1-wfsAA-spB2.snap |   1 +
 ...put_and_workspace@ws2-out1-wfsBU-spB1.snap |   1 +
 ...put_and_workspace@ws2-out1-wfsBU-spB2.snap |   1 +
 ...utput_and_workspace@ws2-out2-fsF-spB1.snap |   1 +
 ...utput_and_workspace@ws2-out2-fsF-spB2.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsAA-spB1.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsAA-spB2.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsB1-spB1.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsB1-spB2.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsB2-spB1.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsB2-spB2.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsBN-spB1.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsBN-spB2.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsBU-spB1.snap |   1 +
 ...and_workspace@ws2-out2-fsF-wfsBU-spB2.snap |   1 +
 ...et_output_and_workspace@ws2-out2-spB1.snap |   1 +
 ...et_output_and_workspace@ws2-out2-spB2.snap |   1 +
 ...put_and_workspace@ws2-out2-wfsAA-spB1.snap |   1 +
 ...put_and_workspace@ws2-out2-wfsAA-spB2.snap |   1 +
 ...put_and_workspace@ws2-out2-wfsBU-spB1.snap |   1 +
 ...put_and_workspace@ws2-out2-wfsBU-spB2.snap |   1 +
 ..._target_output_and_workspace@ws2-spB1.snap |   1 +
 ..._target_output_and_workspace@ws2-spB2.snap |   1 +
 ...t_output_and_workspace@ws2-wfsAA-spB1.snap |   1 +
 ...t_output_and_workspace@ws2-wfsAA-spB2.snap |   1 +
 ...t_output_and_workspace@ws2-wfsBU-spB1.snap |   1 +
 ...t_output_and_workspace@ws2-wfsBU-spB2.snap |   1 +
 src/window/mapped.rs                          |  82 +++++++++-
 142 files changed, 380 insertions(+), 85 deletions(-)

diff --git a/src/layout/floating.rs b/src/layout/floating.rs
index 5c0eb121..8c1840d4 100644
--- a/src/layout/floating.rs
+++ b/src/layout/floating.rs
@@ -376,7 +376,7 @@ impl<W: LayoutElement> FloatingSpace<W> {
         } else {
             // If the window wasn't fullscreen without a floating size (e.g. it was tiled before),
             // ask for the current size.
-            floating_size.unwrap_or_else(|| win.size_to_request())
+            floating_size.unwrap_or_else(|| win.expected_size())
         };
         // Make sure fixed-size through window rules keeps working.
         let min_size = win.min_size();
@@ -597,11 +597,7 @@ impl<W: LayoutElement> FloatingSpace<W> {
         win_width = ensure_min_max_size(win_width, min_size.w, max_size.w);
         win_width = max(1, win_width);
 
-        let mut win_height = win.size_to_request().h;
-        // If we requested height = 0, then switch to the current height.
-        if win_height == 0 {
-            win_height = win.size().h;
-        }
+        let win_height = win.expected_size().h;
         let win_height = ensure_min_max_size(win_height, min_size.h, max_size.h);
 
         let win_size = Size::from((win_width, win_height));
@@ -630,11 +626,7 @@ impl<W: LayoutElement> FloatingSpace<W> {
         win_height = ensure_min_max_size(win_height, min_size.h, max_size.h);
         win_height = max(1, win_height);
 
-        let mut win_width = win.size_to_request().w;
-        // If we requested width = 0, then switch to the current width.
-        if win_width == 0 {
-            win_width = win.size().w;
-        }
+        let win_width = win.expected_size().w;
         let win_width = ensure_min_max_size(win_width, min_size.w, max_size.w);
 
         let win_size = Size::from((win_width, win_height));
@@ -771,7 +763,7 @@ impl<W: LayoutElement> FloatingSpace<W> {
         data.update(tile);
 
         // Update the stored floating window size.
-        let floating_size = tile.window().size_to_request();
+        let floating_size = tile.window().expected_size();
         tile.set_floating_window_size(floating_size);
 
         // When resizing by top/left edge, update the position accordingly.
diff --git a/src/layout/mod.rs b/src/layout/mod.rs
index 8e86c0ca..bc2716af 100644
--- a/src/layout/mod.rs
+++ b/src/layout/mod.rs
@@ -197,15 +197,27 @@ pub trait LayoutElement {
     /// Size previously requested through [`LayoutElement::request_size()`].
     fn requested_size(&self) -> Option<Size<i32, Logical>>;
 
-    /// Size that we will request of this window.
+    /// Size that we expect this window has or will shortly have.
     ///
     /// This can be different from [`requested_size()`](LayoutElement::requested_size()). For
     /// example, for floating windows this will generally return the current window size, rather
     /// than the last size that we requested, since we want floating windows to be able to change
     /// size freely. But not always: if we just requested a floating window to resize and it hasn't
     /// responded to it yet, this will return the newly requested size.
-    fn size_to_request(&self) -> Size<i32, Logical> {
-        self.requested_size().unwrap_or_else(|| self.size())
+    ///
+    /// This function should never return a 0 size component.
+    ///
+    /// The default impl is for testing only, it will not preserve the window's own size changes.
+    fn expected_size(&self) -> Size<i32, Logical> {
+        let mut requested = self.requested_size().unwrap_or_default();
+        let current = self.size();
+        if requested.w == 0 {
+            requested.w = current.w;
+        }
+        if requested.h == 0 {
+            requested.h = current.h;
+        }
+        requested
     }
 
     fn is_child_of(&self, parent: &Self) -> bool;
@@ -1155,7 +1167,7 @@ impl<W: LayoutElement> Layout<W> {
 
                 // Update the floating size in case the window resizes itself during an interactive
                 // move.
-                let floating_size = move_.tile.window().size_to_request();
+                let floating_size = move_.tile.window().expected_size();
                 move_.tile.set_floating_window_size(floating_size);
 
                 return;
diff --git a/src/tests/floating.rs b/src/tests/floating.rs
index a6d903d0..62657378 100644
--- a/src/tests/floating.rs
+++ b/src/tests/floating.rs
@@ -78,14 +78,18 @@ fn resize_to_different_size() {
     let (mut f, id, surface) = set_up();
     let _ = f.client(id).window(&surface).recent_configures();
 
+    // Commit in response to the Activated state change configure.
+    f.client(id).window(&surface).ack_last_and_commit();
+    f.double_roundtrip(id);
+
     f.niri().layout.toggle_window_floating(None);
     f.niri().layout.set_column_width(SizeChange::SetFixed(500));
     f.double_roundtrip(id);
 
-    // This should request the new size, 500 ×.
+    // This should request the new size, 500 × 100.
     assert_snapshot!(
         f.client(id).window(&surface).format_recent_configures(),
-        @"size: 500 × 1048, bounds: 1920 × 1080, states: [Activated]"
+        @"size: 500 × 100, bounds: 1920 × 1080, states: [Activated]"
     );
 
     // Focus a different output which should drop the Activated state.
@@ -94,7 +98,7 @@ fn resize_to_different_size() {
     // This should request the new size since the window hasn't committed yet.
     assert_snapshot!(
         f.client(id).window(&surface).format_recent_configures(),
-        @"size: 500 × 1048, bounds: 1920 × 1080, states: []"
+        @"size: 500 × 100, bounds: 1920 × 1080, states: []"
     );
 
     // Ack but don't commit yet.
@@ -107,7 +111,7 @@ fn resize_to_different_size() {
     // This should request the new size since the window hasn't committed yet.
     assert_snapshot!(
         f.client(id).window(&surface).format_recent_configures(),
-        @"size: 500 × 1048, bounds: 1920 × 1080, states: [Activated]"
+        @"size: 500 × 100, bounds: 1920 × 1080, states: [Activated]"
     );
 
     // Commit but with some different size.
@@ -507,3 +511,143 @@ fn resize_during_interactive_move_propagates_to_floating() {
         @"size: 300 × 300, bounds: 1920 × 1080, states: [Activated]"
     );
 }
+
+#[test]
+fn resize_in_steps() {
+    let (mut f, id, surface) = set_up();
+
+    f.niri().layout.toggle_window_floating(None);
+    f.double_roundtrip(id);
+    let _ = f.client(id).window(&surface).recent_configures();
+
+    // Commit in response to the floating bounds state change configure.
+    f.client(id).window(&surface).ack_last_and_commit();
+    f.double_roundtrip(id);
+
+    // Request a size change to a different size in two steps.
+    f.niri().layout.set_column_width(SizeChange::SetFixed(500));
+    f.niri()
+        .layout
+        .set_window_height(None, SizeChange::SetFixed(500));
+    f.double_roundtrip(id);
+
+    // This should request the full new size (500 × 500) once.
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @"size: 500 × 500, bounds: 1920 × 1080, states: [Activated]"
+    );
+
+    let window = f.client(id).window(&surface);
+    let serial = window.configures_received.last().unwrap().0;
+
+    // Request a size change now that the previous one is pending-but-not-acked.
+    f.niri().layout.set_column_width(SizeChange::SetFixed(600));
+    // Drop Activated to work around resize throttling.
+    f.niri_focus_output(2);
+    f.double_roundtrip(id);
+
+    // This should request the new size (600 × 500) once.
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @"size: 600 × 500, bounds: 1920 × 1080, states: []"
+    );
+
+    // Commit in response to the previous configure.
+    let window = f.client(id).window(&surface);
+    window.xdg_surface.ack_configure(serial);
+    window.set_size(500, 500);
+    window.commit();
+
+    f.double_roundtrip(id);
+
+    // This shouldn't request anything.
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @""
+    );
+
+    // Request a height change now that the first one is committed-to, but the second isn't.
+    let niri = f.niri();
+    let mapped = niri.layout.windows().next().unwrap().1;
+    let window = mapped.window.clone();
+    f.niri()
+        .layout
+        .set_window_height(Some(&window), SizeChange::SetFixed(600));
+    // Add Activated to work around resize throttling.
+    f.niri_focus_output(1);
+    f.double_roundtrip(id);
+
+    // This should request the latest sizes (600 × 600).
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @"size: 600 × 600, bounds: 1920 × 1080, states: [Activated]"
+    );
+}
+
+#[test]
+fn state_change_doesnt_break_use_window_size() {
+    let (mut f, id, surface) = set_up();
+
+    f.niri().layout.toggle_window_floating(None);
+    f.double_roundtrip(id);
+    let _ = f.client(id).window(&surface).recent_configures();
+
+    // Commit in response to the bounds change that comes with toggling floating.
+    f.client(id).window(&surface).ack_last_and_commit();
+    f.roundtrip(id);
+
+    // Request a size change to a different size.
+    f.niri().layout.set_column_width(SizeChange::SetFixed(500));
+    f.double_roundtrip(id);
+
+    // This should request the new size (500 × 100).
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @"size: 500 × 100, bounds: 1920 × 1080, states: [Activated]"
+    );
+
+    let window = f.client(id).window(&surface);
+    let serial = window.configures_received.last().unwrap().0;
+
+    // Request a state change by dropping Activated.
+    f.niri_focus_output(2);
+    f.double_roundtrip(id);
+
+    // This should request the new size (500 × 100).
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @"size: 500 × 100, bounds: 1920 × 1080, states: []"
+    );
+
+    // Commit in response to the previous configure with a different size.
+    let window = f.client(id).window(&surface);
+    window.xdg_surface.ack_configure(serial);
+    window.set_size(300, 300);
+    window.commit();
+
+    f.double_roundtrip(id);
+
+    // This shouldn't request anything.
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @""
+    );
+
+    // Request a height change now that the first one is committed-to, but the second isn't.
+    let niri = f.niri();
+    let mapped = niri.layout.windows().next().unwrap().1;
+    let window = mapped.window.clone();
+    f.niri()
+        .layout
+        .set_window_height(Some(&window), SizeChange::SetFixed(600));
+    // Add Activated state to force a configure.
+    f.niri_focus_output(1);
+    f.double_roundtrip(id);
+
+    // This should already request the current width (300 × 600) rather than the pending previous
+    // width (500 × 600) from the state change configure.
+    assert_snapshot!(
+        f.client(id).window(&surface).format_recent_configures(),
+        @"size: 300 × 600, bounds: 1920 × 1080, states: [Activated]"
+    );
+}
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-spB2.snap
index c8356791..6463aa33 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA1.snap
index f0872d59..8006d099 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA2.snap
index dedeb677..4d4ee570 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB1.snap
index d4e7c18f..d98206e6 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB2.snap
index f4f62cd7..ba99060e 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB1.snap
index 361f9204..a8bf24ef 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB2.snap
index 0f1d3456..5a7939a4 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsB2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBN-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBN-spB2.snap
index 2ffef54d..0c497729 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBN-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBN-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBU-spB2.snap
index 5e33b8fe..ed0155e5 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsF-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA1.snap
index dbcb70f1..e8a53953 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA2.snap
index 734218b9..5f068979 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spB1.snap
index be7991d7..94af9b36 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@fsT-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA1.snap
index 874b3974..f402883a 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA2.snap
index 125fadd0..115f4e74 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB1.snap
index 7b38201b..edb83da3 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB2.snap
index 0b17c779..1853b8f2 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsF-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA1.snap
index 5e2ed003..245d6712 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA2.snap
index 08bb2929..d26d382d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB1.snap
index 6396769d..7f1ec39d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB2.snap
index ca10d9b2..e2b10554 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-fsT-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA1.snap
index 25c069a3..28890685 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA2.snap
index a14fba3a..62ccba42 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB1.snap
index 76136dc4..0b6cf885 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB2.snap
index 5e6dde7d..2f76ea1d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out1-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB1.snap
index 44fcc931..e19ccb38 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB2.snap
index af1e2bbb..04ccd0d8 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB1.snap
index e1d1a7e8..53c979bd 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB2.snap
index 2a8331e1..563da11e 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB1.snap
index e41250b1..ec25a23b 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB2.snap
index 09251a10..c310cd45 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB1-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB1.snap
index 0ecb03e2..56691999 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB2.snap
index a9d83656..beff2b5c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsB2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB1.snap
index 41f12215..cc121d6c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB2.snap
index bbf838dd..fdecf5b3 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBN-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB1.snap
index 6294934a..f3ec6aae 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB2.snap
index 9a5070c6..3c07bb4d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-fsF-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB1.snap
index 83c9ea6b..2288831f 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB2.snap
index 9d4adf5f..09c1e174 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB1.snap
index db580699..e6a8cd24 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB2.snap
index 81f772b7..f25710cc 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB1.snap
index eaaec3ef..49ebeed4 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB2.snap
index 03c7519e..dce24402 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@out2-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@spB2.snap
index 638a6cd1..67037cfb 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA1.snap
index 74c005ca..9e34de71 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA2.snap
index 1bc42009..2c71f648 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB1.snap
index 88b21155..029bdd06 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB2.snap
index 55c6885e..e506f7f4 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsBU-spB2.snap
index b8608778..0a491ee9 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA1.snap
index e6954419..19d77082 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA2.snap
index b74773a2..786e7334 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB1.snap
index 95cba72b..ea351810 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB2.snap
index bb4d16fe..b7f0a9f5 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsF-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA1.snap
index 9ebdb8d8..0e5bcffb 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA2.snap
index d4b89fdc..794b7a11 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB1.snap
index 22e105da..67cff00f 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB2.snap
index dba34ea5..a8621ce9 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-fsT-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA1.snap
index 68992a4e..1bb6d057 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA2.snap
index b17d2714..cbf09f1f 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB1.snap
index 011f7a58..1e20074d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB2.snap
index 1dffc9a1..ca736e48 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsF-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA1.snap
index 0b35423b..6d9f0828 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA2.snap
index ca0aea42..950503cc 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB1.snap
index 765241e4..79628535 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB2.snap
index f8c022be..d97e1dcc 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-fsT-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA1.snap
index 8f135aa8..a65e9703 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA2.snap
index d5c5bc9f..86e495a2 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB1.snap
index 8890170b..b0066cde 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB2.snap
index df3d5162..64ab2330 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out1-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA1.snap
index 683a9acd..261fb8f8 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA2.snap
index 75e232e2..16d30460 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB1.snap
index 35beb064..d3348cb1 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB2.snap
index bb3175db..f2cd6933 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsF-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA1.snap
index 932a6ad7..2708f587 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA2.snap
index 055c467c..aae7b880 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1248 × 688, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB1.snap
index 21a35d38..396d54d1 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB2.snap
index e5720dd4..bdbdf330 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-fsT-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 1280 × 720, bounds: 1280 × 720, states: [Fullscreen]
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA1.snap
index f64af145..07031d81 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA2.snap
index 44b91ce5..f853a17c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB1.snap
index e4b79d5f..1199bdc8 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB2.snap
index ef37fbc2..16fe2c5c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-out2-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA1.snap
index 18019116..15d03c05 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA1.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA2.snap
index c03e24c0..ed0d9974 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spA2.snap
@@ -12,4 +12,4 @@ size: 616 × 688, bounds: 1248 × 688, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB1.snap
index bdd7f178..7db10922 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB1.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB2.snap
index d8c2d6ae..769e2a61 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws1-wfsAA-spB2.snap
@@ -12,4 +12,4 @@ size: 0 × 0, bounds: 1280 × 720, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1280 × 720, states: []
-size: 0 × 0, bounds: 1280 × 720, states: [Activated]
+size: 1 × 1, bounds: 1280 × 720, states: [Activated]
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB1.snap
index cfc520cd..8cd8d3e5 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB2.snap
index a404dced..52bdcb6c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB1.snap
index 525ed172..1ddad5ca 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB2.snap
index fd35b7b8..e2802f15 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB1.snap
index ac7a15c8..5f9e8e0f 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB2.snap
index 0b711940..99a4d679 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB1-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB1.snap
index 00552547..1acc65b8 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB2.snap
index 37a88221..ac9e72b2 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsB2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB1.snap
index eae7e9c0..3c87ad74 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB2.snap
index c3499d94..8c85a478 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBN-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB1.snap
index 0ae52785..6ac91906 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB2.snap
index 50e09212..4258357f 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-fsF-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB1.snap
index a2989d5e..33bdf6fa 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB2.snap
index 02b3a620..fabc18f5 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB1.snap
index 39a17038..7d54639a 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB2.snap
index abf75be8..136ed7be 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB1.snap
index ae224927..5b0e1c47 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB2.snap
index 7804d989..6919cdb4 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB1-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB1.snap
index 859e8611..27cbe7da 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB2.snap
index 5158a1f7..586dc440 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsB2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB1.snap
index 2de38807..337c3433 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB2.snap
index 435ab320..3097d6b7 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBN-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB1.snap
index 93d39c05..1138b129 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB2.snap
index 146ceae6..45da9adf 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-fsF-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB1.snap
index cca9872c..12fe5b04 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB2.snap
index 813297e9..20f3fd53 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB1.snap
index f8bacfbd..60d5e8eb 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB2.snap
index c11bea2f..29d5ed0d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB1.snap
index 0d9197a4..ffec1cfc 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB2.snap
index a50355a5..c25801f4 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out1-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB1.snap
index 235fd3d7..08c651e4 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB2.snap
index 01b34673..9c7318bb 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB1.snap
index 4378d1a0..f15ab74c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB2.snap
index 40cd2089..85dc715d 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB1.snap
index 7010488a..dce28870 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB2.snap
index 3af22838..7328f69b 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB1-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB1.snap
index fbef64f2..9b516607 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB2.snap
index 6c46ed35..f3b2a62b 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsB2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB1.snap
index 546397a8..11d5eb70 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB2.snap
index e492eb21..7ae45c6a 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBN-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB1.snap
index cdb988e8..b2cb6d92 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB2.snap
index b0dd8006..9d1f96c6 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-fsF-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB1.snap
index ff1abf4e..96b2b6cf 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB2.snap
index f69e2d6c..bd68813b 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB1.snap
index 4399a0b2..4fe1dce8 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB2.snap
index 5ba74a21..d6bca7aa 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB1.snap
index aaa162af..aed23c8c 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB2.snap
index f9cf0b06..345f202a 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-out2-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB1.snap
index c13252b8..8c74f674 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB2.snap
index e2966b80..2417bf40 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB1.snap
index bd0dae7a..7546818a 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB1.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB2.snap
index 29b76587..75c313c7 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsAA-spB2.snap
@@ -12,3 +12,4 @@ size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
 size: 0 × 0, bounds: 1920 × 1080, states: []
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB1.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB1.snap
index b5107dcf..0f635803 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB1.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB1.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB2.snap b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB2.snap
index c819206d..a7d72433 100644
--- a/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB2.snap
+++ b/src/tests/snapshots/niri__tests__window_opening__check_target_output_and_workspace@ws2-wfsBU-spB2.snap
@@ -11,3 +11,4 @@ initial configure:
 size: 0 × 0, bounds: 1920 × 1080, states: []
 
 post-map configures:
+size: 1 × 1, bounds: 1920 × 1080, states: []
diff --git a/src/window/mapped.rs b/src/window/mapped.rs
index a92608d3..5f5f6c3e 100644
--- a/src/window/mapped.rs
+++ b/src/window/mapped.rs
@@ -750,7 +750,27 @@ impl LayoutElement for Mapped {
         let _span =
             trace_span!("send_pending_configure", surface = ?toplevel.wl_surface().id()).entered();
 
-        if toplevel.has_pending_changes() {
+        // Check for pending changes manually to account fo RequestSizeOnce::UseWindowSize.
+        let has_pending_changes = with_toplevel_role(self.toplevel(), |role| {
+            if role.server_pending.is_none() {
+                return false;
+            }
+
+            let current_server_size = role.current_server_state().size;
+            let server_pending = role.server_pending.as_mut().unwrap();
+
+            // With UseWindowSize, we do not consider size-only changes, because we will
+            // request the current window size and do not expect it to actually change.
+            if let Some(RequestSizeOnce::UseWindowSize) = self.request_size_once {
+                server_pending.size = current_server_size;
+            }
+
+            let server_pending = role.server_pending.as_ref().unwrap();
+            server_pending != role.current_server_state()
+        });
+
+        if has_pending_changes {
+            // If needed, replace the pending size with the current window size.
             if let Some(RequestSizeOnce::UseWindowSize) = self.request_size_once {
                 let size = self.window.geometry().size;
                 toplevel.with_pending_state(|state| {
@@ -809,19 +829,65 @@ impl LayoutElement for Mapped {
         self.toplevel().with_pending_state(|state| state.size)
     }
 
-    fn size_to_request(&self) -> Size<i32, Logical> {
+    fn expected_size(&self) -> Size<i32, Logical> {
         let current_size = self.window.geometry().size;
 
+        // Check if we should be using the current window size.
+        //
+        // This branch can be useful (give different result than the logic below) in this example
+        // case:
+        //
+        // 1. We request_size_once a size change.
+        // 2. We send a second configure requesting a state change.
+        // 3. The window acks and commits-to the first configure but not the second, with a
+        //    different size.
+        //
+        // In this case self.request_size_once will already flip to UseWindowSize and this branch
+        // will return the window's own new size, but the logic below would see an uncommitted size
+        // change and return our size.
         if let Some(RequestSizeOnce::UseWindowSize) = self.request_size_once {
             return current_size;
         }
 
-        // FIXME: Ideally, if the window doesn't have a pending resize or an uncommitted acked
-        // size, we should request the current window size, rather than the requested size. This
-        // will keep the window size as-is when moving to floating in the case that a window
-        // changed its size in the tiling layout and then we requested a resize. However, that's
-        // pretty edge-casy and I don't want to complicate this logic for that at the moment.
-        self.requested_size().unwrap_or(current_size)
+        let pending_size = with_toplevel_role(self.toplevel(), |role| {
+            // If we have a server-pending size change that we haven't sent yet, use that size.
+            if let Some(server_pending) = &role.server_pending {
+                let current_server = role.current_server_state();
+                if server_pending.size != current_server.size {
+                    return Some(server_pending.size.unwrap_or_default());
+                }
+            }
+
+            // If we have a sent-but-not-committed-to size, use that.
+            let (last_sent, last_serial) = if let Some(configure) = role.pending_configures().last()
+            {
+                (&configure.state, configure.serial)
+            } else {
+                (
+                    role.last_acked.as_ref().unwrap(),
+                    role.configure_serial.unwrap(),
+                )
+            };
+
+            if let Some(current_serial) = role.current_serial {
+                if !current_serial.is_no_older_than(&last_serial) {
+                    return Some(last_sent.size.unwrap_or_default());
+                }
+            }
+
+            None
+        });
+
+        // If we have no pending size change (size change that the window hasn't committed to), or
+        // if some component of the pending size change is zero, use the current window size.
+        let mut size = pending_size.unwrap_or_default();
+        if size.w == 0 {
+            size.w = current_size.w;
+        }
+        if size.h == 0 {
+            size.h = current_size.h;
+        }
+        size
     }
 
     fn is_child_of(&self, parent: &Self) -> bool {