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

layout/tiling: Make swapping layout less confusing

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-08-08 20:48:56 +02:00
parent 1f8915f802
commit 450cc6a323
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -854,26 +854,7 @@ impl TilingLayout {
let this_node = this_tree.get_mut(&this_desc.node).ok()?; let this_node = this_tree.get_mut(&this_desc.node).ok()?;
let other_node = other_tree.get_mut(&other_desc.node).ok()?; let other_node = other_tree.get_mut(&other_desc.node).ok()?;
// swap data
let other_data = other_node.data().clone();
other_node.replace_data(this_node.replace_data(other_data));
if let Data::Mapped { mapped, .. } = this_node.data_mut() { if let Data::Mapped { mapped, .. } = this_node.data_mut() {
if this.output != other_output {
mapped.output_leave(&other_output);
mapped.output_enter(&this.output, mapped.bbox());
for (ref surface, _) in mapped.windows() {
toplevel_leave_output(surface, &other_output);
toplevel_enter_output(surface, &this.output);
}
}
for (ref surface, _) in mapped.windows() {
toplevel_leave_workspace(surface, &other_desc.handle);
toplevel_enter_workspace(surface, &this_desc.handle);
}
*mapped.tiling_node_id.lock().unwrap() = Some(this_desc.node.clone());
}
if let Data::Mapped { mapped, .. } = other_node.data_mut() {
if this.output != other_output { if this.output != other_output {
mapped.output_leave(&this.output); mapped.output_leave(&this.output);
mapped.output_enter(&other_output, mapped.bbox()); mapped.output_enter(&other_output, mapped.bbox());
@ -888,6 +869,25 @@ impl TilingLayout {
} }
*mapped.tiling_node_id.lock().unwrap() = Some(other_desc.node.clone()); *mapped.tiling_node_id.lock().unwrap() = Some(other_desc.node.clone());
} }
if let Data::Mapped { mapped, .. } = other_node.data_mut() {
if this.output != other_output {
mapped.output_leave(&other_output);
mapped.output_enter(&this.output, mapped.bbox());
for (ref surface, _) in mapped.windows() {
toplevel_leave_output(surface, &other_output);
toplevel_enter_output(surface, &this.output);
}
}
for (ref surface, _) in mapped.windows() {
toplevel_leave_workspace(surface, &other_desc.handle);
toplevel_enter_workspace(surface, &this_desc.handle);
}
*mapped.tiling_node_id.lock().unwrap() = Some(this_desc.node.clone());
}
// swap data
let other_data = other_node.data().clone();
other_node.replace_data(this_node.replace_data(other_data));
// swap children // swap children
let mut this_children = this_node let mut this_children = this_node