mirror of
https://github.com/pinnacle-comp/pinnacle.git
synced 2024-12-27 21:58:18 +01:00
Re-add stuff I removed
This commit is contained in:
parent
8f2ce70586
commit
430fb76fc8
1 changed files with 31 additions and 7 deletions
|
@ -572,12 +572,36 @@ impl State {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: don't use the focused output, use the outputs the two windows are on
|
let mut same_suggested_size = false;
|
||||||
let output = self
|
|
||||||
.focus_state
|
if let WindowElement::Wayland(w1) = win1 {
|
||||||
.focused_output
|
if let WindowElement::Wayland(w2) = win2 {
|
||||||
.clone()
|
if let Some(w1_size) = w1.toplevel().current_state().size {
|
||||||
.expect("no focused output");
|
if let Some(w2_size) = w2.toplevel().current_state().size {
|
||||||
self.update_windows(&output);
|
same_suggested_size = w1_size == w2_size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if same_suggested_size {
|
||||||
|
let win1_loc = self.space.element_location(win1);
|
||||||
|
let win2_loc = self.space.element_location(win2);
|
||||||
|
|
||||||
|
if let Some(win1_loc) = win1_loc {
|
||||||
|
if let Some(win2_loc) = win2_loc {
|
||||||
|
self.space.map_element(win1.clone(), win2_loc, false);
|
||||||
|
self.space.map_element(win2.clone(), win1_loc, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// TODO: don't use the focused output, use the outputs the two windows are on
|
||||||
|
let output = self
|
||||||
|
.focus_state
|
||||||
|
.focused_output
|
||||||
|
.clone()
|
||||||
|
.expect("no focused output");
|
||||||
|
self.update_windows(&output);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue