3 files changed, 59 insertions, 0 deletions

diff --git a/crates/core/src/manager/mod.rs b/crates/core/src/manager/mod.rs
index e4ac1c2..d449486 100644
--- a/crates/core/src/manager/mod.rs
+++ b/crates/core/src/manager/mod.rs
@@ -3,6 +3,8 @@ use crate::layout::{Layout, MasterStackLayout, NoOpLayout, TilingConfig};
 use crate::monitor::{DisabledMonitor, Monitor, MonitorId, MonitorSplit};
 use crate::placement::{PlacementConfig, SmartPlacement, SnapZoneKind, MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH};
 use crate::rules::WindowRule;
+#[cfg(test)]
+use crate::rules::{WindowMatch, WindowRuleActions};
 use crate::lock_config::LockConfig;
 use crate::theme::ThemeConfig;
 use crate::window::{likely_draws_own_titlebar, ResizeEdge, TitlebarHit, Window, WindowId, RESIZE_MARGIN};
diff --git a/crates/core/src/manager/tests.rs b/crates/core/src/manager/tests.rs
index 860af89..f703f25 100644
--- a/crates/core/src/manager/tests.rs
+++ b/crates/core/src/manager/tests.rs
@@ -26,6 +26,51 @@
     }
 
     #[test]
+    fn a_smart_placed_window_is_marked_size_provisional() {
+        let mut wm = wm_with_monitor();
+        let id = wm.alloc_window_id();
+        let w = Window::new(id, "first");
+        wm.add_window(w);
+        // No remembered geometry, no rule, not maximized - the size that
+        // just got smart-placed is nothing but `Window::new`'s own default
+        // guess, so a backend should be free to let the client override it.
+        assert!(wm.window(id).unwrap().size_is_provisional);
+    }
+
+    #[test]
+    fn a_remembered_geometry_is_never_provisional() {
+        let mut wm = wm_with_monitor();
+        wm.set_remembered_geometry("some-app".to_string(), (100, 100, 900, 700));
+        let id = wm.alloc_window_id();
+        let mut w = Window::new(id, "second");
+        w.app_id = "some-app".to_string();
+        wm.add_window(w);
+        let win = wm.window(id).unwrap();
+        assert_eq!((win.geometry.width, win.geometry.height), (900, 700));
+        assert!(!win.size_is_provisional, "a deliberately remembered size must never be second-guessed by the client's own default");
+    }
+
+    #[test]
+    fn a_rules_explicit_geometry_is_never_provisional() {
+        let mut wm = wm_with_monitor();
+        wm.rules.push(WindowRule { matcher: WindowMatch { class: Some("ruled-app".to_string()), ..Default::default() }, actions: WindowRuleActions { geometry: Some(Rect::new(10, 10, 500, 400)), ..Default::default() } });
+        let id = wm.alloc_window_id();
+        let mut w = Window::new(id, "third");
+        w.app_id = "ruled-app".to_string();
+        wm.add_window(w);
+        assert!(!wm.window(id).unwrap().size_is_provisional, "a rule's own explicit geometry is a deliberate choice, not a guess");
+    }
+
+    #[test]
+    fn phone_mode_maximize_is_never_provisional() {
+        let mut wm = wm_with_monitor();
+        wm.phone_mode = true;
+        let id = wm.alloc_window_id();
+        wm.add_window(Window::new(id, "fourth"));
+        assert!(!wm.window(id).unwrap().size_is_provisional, "a deliberate full-monitor fill is not a guess needing a client override");
+    }
+
+    #[test]
     fn add_window_picks_up_the_configured_default_decoration_mode() {
         let mut wm = wm_with_monitor();
         wm.theme.default_decorated = false;
diff --git a/crates/core/src/manager/windows.rs b/crates/core/src/manager/windows.rs
index 40b4c17..f29d19a 100644
--- a/crates/core/src/manager/windows.rs
+++ b/crates/core/src/manager/windows.rs
@@ -151,10 +151,17 @@ impl WindowManager {
                 let step = self.next_cascade_step.get();
                 self.next_cascade_step.set(step.wrapping_add(1));
                 window.geometry = SmartPlacement::place(monitor, &existing, size, &self.placement, step);
+                // See `Window::size_is_provisional`'s own doc comment:
+                // `size` above is whatever a backend hardcoded before this
+                // window's real content was known, not a genuine
+                // preference - reset below if a rule or maximize goes on
+                // to give this window a real, deliberate size instead.
+                window.size_is_provisional = true;
             }
         }
         if let Some(geometry) = actions.as_ref().and_then(|a| a.geometry) {
             window.geometry = geometry;
+            window.size_is_provisional = false;
         }
         // `general.phone_mode`'s own real default (see its doc comment on
         // `WindowManager` for the full "optional phone mode" reasoning):
@@ -176,6 +183,11 @@ impl WindowManager {
         self.restack_pinned();
         if maximize {
             self.toggle_maximize(id);
+            // Deliberately full-monitor, not a guess - see `Window::
+            // size_is_provisional`'s own doc comment.
+            if let Some(w) = self.windows.get_mut(&id) {
+                w.size_is_provisional = false;
+            }
         }
         id
     }