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

tiling: Fix wrong focus swapping across workspaces

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-09-11 21:12:35 +02:00
parent dbb5338322
commit 2588b8920d
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1060,7 +1060,7 @@ impl TilingLayout {
return other
.as_ref()
.unwrap_or(&this)
.node_desc_to_focus(&other_desc);
.node_desc_to_focus(other_desc);
}
}
@ -1068,6 +1068,7 @@ impl TilingLayout {
let blocker = TilingLayout::update_positions(&this_output, &mut this_tree, this.gaps);
this_queue.push_tree(this_tree, ANIMATION_DURATION, blocker);
let has_other_tree = other_tree.is_some();
if let Some(mut other_tree) = other_tree {
let (other_queue, gaps) = if let Some(other) = other.as_mut() {
(other.queues.get_mut(&other_output).unwrap(), other.gaps)
@ -1079,8 +1080,8 @@ impl TilingLayout {
}
match (&this_desc.stack_window, &other_desc.stack_window) {
(None, None) => this.node_desc_to_focus(&this_desc),
(None, Some(_)) => None,
(None, None) if !has_other_tree => this.node_desc_to_focus(&this_desc),
//(None, Some(_)) => None,
_ => other
.as_ref()
.unwrap_or(&this)
@ -1088,7 +1089,7 @@ impl TilingLayout {
}
}
fn node_desc_to_focus(&self, desc: &NodeDesc) -> Option<KeyboardFocusTarget> {
pub fn node_desc_to_focus(&self, desc: &NodeDesc) -> Option<KeyboardFocusTarget> {
let output = desc.output.upgrade()?;
let queue = self.queues.get(&output)?;
let tree = &queue.trees.back().unwrap().0;