From 747a24199a6c2a35854c68d41364f33886d0b3ac Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Thu, 21 Sep 2023 12:38:33 +0200
Subject: [PATCH] shell: Put toplevel on new workspace, when removing Outputs

---
 src/shell/mod.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/shell/mod.rs b/src/shell/mod.rs
index 396d54e9..4154db4e 100644
--- a/src/shell/mod.rs
+++ b/src/shell/mod.rs
@@ -728,6 +728,12 @@ impl Shell {
                                 [WorkspaceCapabilities::Activate].into_iter(),
                             );
                             workspace.handle = workspace_handle;
+                            for window in workspace.mapped() {
+                                for (surface, _) in window.windows() {
+                                    self.toplevel_info_state
+                                        .toplevel_enter_workspace(&surface, &workspace.handle);
+                                }
+                            }
 
                             // update mapping
                             workspace.map_output(new_output, (0, 0).into());