shell: Lift recalculate to consider sticky_layer

src/shell/mod.rs

@@ -795,6 +795,13 @@ impl Workspaces {
         self.refresh(workspace_state, toplevel_info_state, xdg_activation_state)
     }
 
+    pub fn recalculate(&mut self) {
+        for set in self.sets.values_mut() {
+            set.sticky_layer.refresh();
+            set.workspaces.iter_mut().for_each(|w| w.recalculate());
+        }
+    }
+
     pub fn refresh(
         &mut self,
         workspace_state: &mut WorkspaceUpdateGuard<'_, State>,

src/wayland/handlers/compositor.rs

@@ -252,9 +252,7 @@ impl CompositorHandler for State {
         if let Some(output) = layer_output {
             let changed = layer_map_for_output(&output).arrange();
             if changed {
-                for workspace in self.common.shell.workspaces.spaces_mut() {
-                    workspace.recalculate();
-                }
+                self.common.shell.workspaces.recalculate();
             }
         }
 

src/wayland/handlers/layer_shell.rs

@@ -74,9 +74,7 @@ impl WlrLayerShellHandler for State {
                 map.unmap_layer(&layer);
             }
 
-            for workspace in self.common.shell.workspaces.spaces_mut() {
-                workspace.recalculate();
-            }
+            self.common.shell.workspaces.recalculate();
 
             // collect screencopy sessions needing an update
             let mut scheduled_sessions = self.schedule_workspace_sessions(surface.wl_surface());