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

Take slice instead of array in set_workspace_coordinates

Browse source 
As far as I can tell this is equivalent, and there's no particular
reason to use an array. Arrays of options for variable-length arrays are
awkward.
This commit is contained in:
Ian Douglas Scott 2025-03-14 10:30:21 -07:00 • committed by Ian Douglas Scott
parent 7340e2beff
commit 8d6bd47bc4
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shell/mod.rs
View file

@ -4023,7 +4023,7 @@ fn workspace_set_idx(
handle: &WorkspaceHandle, handle: &WorkspaceHandle,
) { ) {
state.set_workspace_name(handle, format!("{}", idx)); state.set_workspace_name(handle, format!("{}", idx));
state.set_workspace_coordinates(handle, [Some(idx as u32), Some(output_pos as u32), None]); state.set_workspace_coordinates(handle, &[idx as u32, output_pos as u32]);
} }
pub fn check_grab_preconditions( pub fn check_grab_preconditions(

12
src/wayland/protocols/workspace/mod.rs
View file

@ -669,22 +669,14 @@ where
self.0.workspace_coordinates(workspace) self.0.workspace_coordinates(workspace)
} }
pub fn set_workspace_coordinates( pub fn set_workspace_coordinates(&mut self, workspace: &WorkspaceHandle, coords: &[u32]) {
&mut self,
workspace: &WorkspaceHandle,
coords: [Option<u32>; 3],
) {
if let Some(workspace) = self if let Some(workspace) = self
.0 .0
.groups .groups
.iter_mut() .iter_mut()
.find_map(|g| g.workspaces.iter_mut().find(|w| w.id == workspace.id)) .find_map(|g| g.workspaces.iter_mut().find(|w| w.id == workspace.id))
{ {
workspace.coordinates = coords workspace.coordinates = coords.to_vec();
.iter()
.flat_map(std::convert::identity)
.copied()
.collect();
} }
} }