leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: Try to migrate workspaces back to their original outputs

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-11-20 19:11:02 +01:00 • committed by Victoria Brekenfeld
parent 18a8692517
commit b6cb945406
2 changed files with 53 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/shell/mod.rs
View file

@ -534,8 +534,38 @@ impl Workspaces {
workspace_state.add_group_output(&set.group, &output);
self.sets.insert(output.clone(), set);
for workspace in &mut self.sets.get_mut(output).unwrap().workspaces {
workspace.set_output(output, toplevel_info_state);
let mut moved_workspaces = Vec::new();
for set in self.sets.values_mut() {
let (preferrs, doesnt) = set
.workspaces
.drain(..)
.partition(|w| w.preferrs_output(output));
moved_workspaces.extend(preferrs);
set.workspaces = doesnt;
}
{
let set = self.sets.get_mut(output).unwrap();
for workspace in &mut moved_workspaces {
workspace_state.remove_workspace(workspace.handle);
let old_workspace_handle = workspace.handle;
workspace.handle = workspace_state.create_workspace(&set.group).unwrap();
workspace_state.set_workspace_capabilities(
&workspace.handle,
[WorkspaceCapabilities::Activate].into_iter(),
);
for window in workspace.mapped() {
for (surface, _) in window.windows() {
toplevel_info_state
.toplevel_leave_workspace(&surface, &old_workspace_handle);
toplevel_info_state.toplevel_enter_workspace(&surface, &workspace.handle);
}
}
}
set.workspaces.extend(moved_workspaces);
for workspace in &mut set.workspaces {
workspace.set_output(output, toplevel_info_state);
workspace.refresh(xdg_activation_state);
}
}
}
@ -951,6 +981,7 @@ impl Shell {
&mut self.workspace_state.update(),
&mut self.toplevel_info_state,
);
self.refresh(); // fixes indicies of any moved workspaces
}
pub fn remove_output(&mut self, output: &Output, seats: impl Iterator<Item = Seat<State>>) {