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

tiling: Fix swap mode with single window stacks

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-09-05 23:38:53 +02:00
parent 1251b7e9f7
commit e992a4b442
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/shell/layout/tiling/mod.rs
View file

@ -789,10 +789,10 @@ impl TilingLayout {
.surfaces() .surfaces()
.position(|s| &s == this_surface) .position(|s| &s == this_surface)
.unwrap(); .unwrap();
this_stack.remove_window(&this_surface);
for (i, surface) in surfaces.into_iter().enumerate() { for (i, surface) in surfaces.into_iter().enumerate() {
this_stack.add_window(surface, Some(this_idx + i)); this_stack.add_window(surface, Some(this_idx + i));
} }
this_stack.remove_window(&this_surface);
let mapped: CosmicMapped = let mapped: CosmicMapped =
CosmicWindow::new(this_surface.clone(), this_stack.loop_handle()).into(); CosmicWindow::new(this_surface.clone(), this_stack.loop_handle()).into();
@ -840,10 +840,10 @@ impl TilingLayout {
.surfaces() .surfaces()
.position(|s| &s == other_surface) .position(|s| &s == other_surface)
.unwrap(); .unwrap();
other_stack.remove_window(&other_surface);
for (i, surface) in surfaces.into_iter().enumerate() { for (i, surface) in surfaces.into_iter().enumerate() {
other_stack.add_window(surface, Some(other_idx + i)); other_stack.add_window(surface, Some(other_idx + i));
} }
other_stack.remove_window(&other_surface);
let mapped: CosmicMapped = let mapped: CosmicMapped =
CosmicWindow::new(other_surface.clone(), other_stack.loop_handle()).into(); CosmicWindow::new(other_surface.clone(), other_stack.loop_handle()).into();
@ -892,10 +892,10 @@ impl TilingLayout {
.unwrap(); .unwrap();
let this_was_active = &this_stack.active() == this_surface; let this_was_active = &this_stack.active() == this_surface;
let other_was_active = &other_stack.active() == other_surface; let other_was_active = &other_stack.active() == other_surface;
this_stack.remove_window(&this_surface);
this_stack.add_window(other_surface.clone(), Some(this_idx)); this_stack.add_window(other_surface.clone(), Some(this_idx));
other_stack.remove_window(&other_surface); this_stack.remove_window(&this_surface);
other_stack.add_window(this_surface.clone(), Some(other_idx)); other_stack.add_window(this_surface.clone(), Some(other_idx));
other_stack.remove_window(&other_surface);
if this_was_active { if this_was_active {
this_stack.set_active(&other_surface); this_stack.set_active(&other_surface);
} }