From da9af7ad23ea91d850ab81c47deefecd40c1f972 Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Thu, 27 Jun 2024 13:32:17 +0200
Subject: [PATCH] floating: Add proper recalculate function

Don't just check maximized windows on every refresh, remapping them and
causing flickering, but introduce a proper recalculate method to be
called on layer-shell events / set_output event.

Also if we need to remap, remap all windows to keep stacking order.
---
 src/shell/layout/floating/mod.rs | 60 +++++++++++++++++++-------------
 src/shell/mod.rs                 |  2 +-
 src/shell/workspace.rs           |  2 +-
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/shell/layout/floating/mod.rs b/src/shell/layout/floating/mod.rs
index 398b6ded..a77a2bdf 100644
--- a/src/shell/layout/floating/mod.rs
+++ b/src/shell/layout/floating/mod.rs
@@ -316,7 +316,7 @@ impl FloatingLayout {
             }
         }
 
-        self.refresh();
+        self.recalculate();
     }
 
     pub fn map(
@@ -1151,6 +1151,41 @@ impl FloatingLayout {
         self.mapped().flat_map(|e| e.windows().map(|(w, _)| w))
     }
 
+    pub fn recalculate(&mut self) {
+        let output = self.space.outputs().next().unwrap().clone();
+        let geometry = layer_map_for_output(&output)
+            .non_exclusive_zone()
+            .as_local();
+
+        // update maximized elements
+        for mapped in self
+            .space
+            .elements()
+            .cloned()
+            .collect::<Vec<_>>()
+            .into_iter()
+        {
+            mapped.set_bounds(geometry.size.as_logical());
+            let prev = self.space.element_geometry(&mapped).map(RectExt::as_local);
+
+            let position = if mapped.is_maximized(false) {
+                mapped.set_geometry(geometry.to_global(&output));
+                geometry.loc
+            } else {
+                prev.clone()
+                    .map(|rect| rect.loc.constrain(geometry))
+                    .unwrap_or(Point::from((0, 0)))
+            };
+
+            let is_activated = mapped.is_activated(false);
+            mapped.configure();
+            self.space
+                .map_element(mapped, position.as_logical(), is_activated);
+        }
+
+        self.refresh();
+    }
+
     #[profiling::function]
     pub fn refresh(&mut self) {
         self.space.refresh();
@@ -1171,29 +1206,6 @@ impl FloatingLayout {
             *element.last_geometry.lock().unwrap() = None;
             self.map_internal(element, None, None, None);
         }
-
-        // update maximized elements
-        let update: Vec<_> = self
-            .space
-            .elements()
-            .filter(|e| e.is_maximized(true))
-            .map(|mapped| {
-                let output = self.space.outputs().next().unwrap().clone();
-                let layers = layer_map_for_output(&output);
-                let geometry = layers.non_exclusive_zone().as_local();
-
-                mapped.set_bounds(geometry.size.as_logical());
-                mapped.set_geometry(geometry.to_global(&output));
-                mapped.configure();
-
-                (mapped.clone(), geometry.loc, mapped.is_activated(true))
-            })
-            .collect();
-
-        for (mapped, position, is_activated) in update {
-            self.space
-                .map_element(mapped, position.as_logical(), is_activated);
-        }
     }
 
     pub fn animations_going(&self) -> bool {
diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 69e49bfe..b0126b21 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -811,7 +811,7 @@ impl Workspaces {
 
     pub fn recalculate(&mut self) {
         for set in self.sets.values_mut() {
-            set.sticky_layer.refresh();
+            set.sticky_layer.recalculate();
             set.workspaces.iter_mut().for_each(|w| w.recalculate());
         }
     }
diff --git a/src/shell/workspace.rs b/src/shell/workspace.rs
index 1a546a06..2192bcf3 100644
--- a/src/shell/workspace.rs
+++ b/src/shell/workspace.rs
@@ -491,7 +491,7 @@ impl Workspace {
 
     pub fn recalculate(&mut self) {
         self.tiling_layer.recalculate();
-        self.floating_layer.refresh();
+        self.floating_layer.recalculate();
     }
 
     pub fn unmaximize_request(&mut self, elem: &CosmicMapped) -> Option<Size<i32, Logical>> {