124c7fe
124c7fec1884905525918eec8759131035fcafc5267851c
2d11762| Status | File | + | - |
|---|---|---|---|
| M |
gar/src/x11/events.rs
|
6 | 0 |
gar/src/x11/events.rsmodified@@ -3141,12 +3141,18 @@ impl WindowManager { | |||
| 3141 | window, target_idx, self.monitors[target_idx].name, target_workspace + 1); | 3141 | window, target_idx, self.monitors[target_idx].name, target_workspace + 1); |
| 3142 | 3142 | ||
| 3143 | // Remove from current workspace | 3143 | // Remove from current workspace |
| 3144 | + let source_ws = self.focused_workspace; | ||
| 3144 | if is_floating { | 3145 | if is_floating { |
| 3145 | self.current_workspace_mut().remove_floating(window); | 3146 | self.current_workspace_mut().remove_floating(window); |
| 3146 | } else { | 3147 | } else { |
| 3147 | self.current_workspace_mut().tree.remove(window); | 3148 | self.current_workspace_mut().tree.remove(window); |
| 3148 | } | 3149 | } |
| 3149 | 3150 | ||
| 3151 | + // Update focus on source workspace so it doesn't point to the moved window | ||
| 3152 | + let new_focus_on_source = self.workspaces[source_ws].tree.first_window() | ||
| 3153 | + .or_else(|| self.workspaces[source_ws].floating.last().copied()); | ||
| 3154 | + self.workspaces[source_ws].focused = new_focus_on_source; | ||
| 3155 | + | ||
| 3150 | // Update window's workspace | 3156 | // Update window's workspace |
| 3151 | if let Some(win) = self.windows.get_mut(&window) { | 3157 | if let Some(win) = self.windows.get_mut(&window) { |
| 3152 | win.workspace = target_workspace; | 3158 | win.workspace = target_workspace; |