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

tiling: Fix merging workspaces

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-11-22 15:47:27 +01:00
parent e88f5898f7
commit ae34a0da62
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -279,8 +279,8 @@ impl TilingLayout {
// TODO: expects last remaining output // TODO: expects last remaining output
let Some((output, dst)) = self.trees.iter_mut().next() else { return; }; let Some((output, dst)) = self.trees.iter_mut().next() else { return; };
let orientation = match output.output.geometry().size { let orientation = match output.output.geometry().size {
x if x.w >= x.h => Orientation::Horizontal, x if x.w >= x.h => Orientation::Vertical,
_ => Orientation::Vertical, _ => Orientation::Horizontal,
}; };
TilingLayout::merge_trees(src, dst, orientation); TilingLayout::merge_trees(src, dst, orientation);
self.refresh() self.refresh()
@ -1187,8 +1187,8 @@ impl TilingLayout {
for (output_data, src) in other.trees { for (output_data, src) in other.trees {
let mut dst = self.trees.entry(output_data.clone()).or_default(); let mut dst = self.trees.entry(output_data.clone()).or_default();
let orientation = match output_data.output.geometry().size { let orientation = match output_data.output.geometry().size {
x if x.w >= x.h => Orientation::Horizontal, x if x.w >= x.h => Orientation::Vertical,
_ => Orientation::Vertical, _ => Orientation::Horizontal,
}; };
TilingLayout::merge_trees(src, &mut dst, orientation); TilingLayout::merge_trees(src, &mut dst, orientation);
} }
@ -1196,17 +1196,24 @@ impl TilingLayout {
} }
fn merge_trees(src: Tree<Data>, dst: &mut Tree<Data>, orientation: Orientation) { fn merge_trees(src: Tree<Data>, dst: &mut Tree<Data>, orientation: Orientation) {
if let Some(root_id) = src.root_node_id() { if let Some(dst_root_id) = dst.root_node_id().cloned() {
let mut stack = Vec::new(); let mut stack = Vec::new();
let root_node = src.get(root_id).unwrap(); if let Some(src_root_id) = src.root_node_id() {
let new_node = Node::new(root_node.data().clone()); let root_node = src.get(src_root_id).unwrap();
let new_id = dst.insert(new_node, InsertBehavior::AsRoot).unwrap(); let new_node = Node::new(root_node.data().clone());
if let Some(root) = dst.root_node_id().cloned() { let new_id = dst
TilingLayout::new_group(dst, &root, &new_id, orientation).unwrap(); .insert(new_node, InsertBehavior::UnderNode(&dst_root_id))
.unwrap();
if let &mut Data::Mapped { ref mut mapped, .. } =
dst.get_mut(&new_id).unwrap().data_mut()
{
*mapped.tiling_node_id.lock().unwrap() = Some(new_id.clone());
}
TilingLayout::new_group(dst, &dst_root_id, &new_id, orientation).unwrap();
stack.push((src_root_id.clone(), new_id));
} }
stack.push((root_id.clone(), new_id));
while let Some((src_id, dst_id)) = stack.pop() { while let Some((src_id, dst_id)) = stack.pop() {
for child_id in src.children_ids(&src_id).unwrap() { for child_id in src.children_ids(&src_id).unwrap() {
let src_node = src.get(&child_id).unwrap(); let src_node = src.get(&child_id).unwrap();
@ -1214,6 +1221,11 @@ impl TilingLayout {
let new_child_id = dst let new_child_id = dst
.insert(new_node, InsertBehavior::UnderNode(&dst_id)) .insert(new_node, InsertBehavior::UnderNode(&dst_id))
.unwrap(); .unwrap();
if let &mut Data::Mapped { ref mut mapped, .. } =
dst.get_mut(&new_child_id).unwrap().data_mut()
{
*mapped.tiling_node_id.lock().unwrap() = Some(new_child_id.clone());
}
stack.push((child_id.clone(), new_child_id)); stack.push((child_id.clone(), new_child_id));
} }
} }