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

shell: we don't need to increment workspace coords

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-05-03 13:01:21 +02:00
parent 64b9295ddb
commit 0c67c6b1b3
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/shell/mod.rs
View file

@ -202,7 +202,7 @@ impl Shell {
if self.spaces.iter().all(|w| w.ext_workspace.is_none()) { if self.spaces.iter().all(|w| w.ext_workspace.is_none()) {
for (idx, workspace) in self.spaces.iter_mut().enumerate() { for (idx, workspace) in self.spaces.iter_mut().enumerate() {
let ext_workspace = group.create_workspace(format!("{}", idx + 1)); let ext_workspace = group.create_workspace(format!("{}", idx + 1));
ext_workspace.set_coordinates(std::iter::once(idx as u32 + 1)); ext_workspace.set_coordinates(std::iter::once(idx as u32));
workspace.ext_workspace = Some(ext_workspace); workspace.ext_workspace = Some(ext_workspace);
} }
self.spaces[_idx] self.spaces[_idx]
@ -212,7 +212,7 @@ impl Shell {
.add_state(ext_work::State::Active); .add_state(ext_work::State::Active);
} else { } else {
let ext_workspace = group.create_workspace(format!("{}", _idx + 1)); let ext_workspace = group.create_workspace(format!("{}", _idx + 1));
ext_workspace.set_coordinates(std::iter::once(_idx as u32 + 1)); ext_workspace.set_coordinates(std::iter::once(_idx as u32));
ext_workspace.add_state(ext_work::State::Active); ext_workspace.add_state(ext_work::State::Active);
if let Some(old) = self.spaces[_idx].ext_workspace.replace(ext_workspace) { if let Some(old) = self.spaces[_idx].ext_workspace.replace(ext_workspace) {
old.remove(); old.remove();
@ -243,7 +243,7 @@ impl Shell {
.as_mut() .as_mut()
.unwrap() .unwrap()
.create_workspace(format!("{}", idx + 1)); .create_workspace(format!("{}", idx + 1));
ext_workspace.set_coordinates(std::iter::once(idx as u32 + 1)); ext_workspace.set_coordinates(std::iter::once(idx as u32));
if idx == active { if idx == active {
ext_workspace.add_state(ext_work::State::Active); ext_workspace.add_state(ext_work::State::Active);
} }
@ -303,7 +303,7 @@ impl Shell {
.as_mut() .as_mut()
.unwrap() .unwrap()
.create_workspace(format!("{}", idx + 1)); .create_workspace(format!("{}", idx + 1));
ext_workspace.set_coordinates(std::iter::once(idx as u32 + 1)); ext_workspace.set_coordinates(std::iter::once(idx as u32));
workspace.ext_workspace = Some(ext_workspace); workspace.ext_workspace = Some(ext_workspace);
} }
} }
@ -426,7 +426,7 @@ impl Shell {
.unwrap_or(true) .unwrap_or(true)
{ {
let ext_workspace = group.create_workspace(format!("{}", idx + 1)); let ext_workspace = group.create_workspace(format!("{}", idx + 1));
ext_workspace.set_coordinates(std::iter::once(idx as u32 + 1)); ext_workspace.set_coordinates(std::iter::once(idx as u32));
if let Some(old) = self.spaces[idx].ext_workspace.replace(ext_workspace) if let Some(old) = self.spaces[idx].ext_workspace.replace(ext_workspace)
{ {
old.remove(); old.remove();