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

shell: Fix workspace numbering off-by-one

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-10 13:01:58 +01:00
parent dec2a8e0b6
commit 4f443a3aab
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/shell/mod.rs
View file

@ -461,7 +461,7 @@ impl Shell {
); );
workspace_set_idx( workspace_set_idx(
&mut state, &mut state,
new_set.workspaces.len() as u8, new_set.workspaces.len() as u8 + 1,
&workspace_handle, &workspace_handle,
); );
workspace.handle = workspace_handle; workspace.handle = workspace_handle;
@ -569,7 +569,7 @@ impl Shell {
&workspace_handle, &workspace_handle,
[WorkspaceCapabilities::Activate].into_iter(), [WorkspaceCapabilities::Activate].into_iter(),
); );
workspace_set_idx(&mut state, i as u8, &workspace_handle); workspace_set_idx(&mut state, i as u8 + 1, &workspace_handle);
let mut new_workspace = Workspace::new(workspace_handle); let mut new_workspace = Workspace::new(workspace_handle);
for output in self.outputs.iter() { for output in self.outputs.iter() {
@ -629,7 +629,7 @@ impl Shell {
&new_workspace_handle, &new_workspace_handle,
[WorkspaceCapabilities::Activate].into_iter(), [WorkspaceCapabilities::Activate].into_iter(),
); );
workspace_set_idx(&mut state, i as u8, &new_workspace_handle); workspace_set_idx(&mut state, i as u8 + 1, &new_workspace_handle);
let mut old_tiling_layer = workspace.tiling_layer.clone(); let mut old_tiling_layer = workspace.tiling_layer.clone();
let mut new_floating_layer = FloatingLayout::new(); let mut new_floating_layer = FloatingLayout::new();
@ -1048,6 +1048,6 @@ fn workspace_set_idx<'a>(
idx: u8, idx: u8,
handle: &WorkspaceHandle, handle: &WorkspaceHandle,
) { ) {
state.set_workspace_name(&handle, format!("{}", idx + 1)); state.set_workspace_name(&handle, format!("{}", idx));
state.set_workspace_coordinates(&handle, [Some(idx as u32), None, None]); state.set_workspace_coordinates(&handle, [Some(idx as u32), None, None]);
} }