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

shell: Fix incomplete focus_stack after swapping

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-09-10 21:10:02 +02:00
parent 03430b76c5
commit 4d215755f6
4 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -86,6 +86,7 @@ pub struct NodeDesc {
pub handle: WorkspaceHandle,
pub node: NodeId,
pub stack_window: Option<CosmicSurface>,
pub focus_stack: Vec<NodeId>,
}
#[derive(Debug, Clone, PartialEq)]
@ -813,8 +814,9 @@ impl TilingLayout {
other.node_desc_to_focus(&NodeDesc {
handle: other_handle.clone(),
node: id,
node: id.clone(),
stack_window: None,
focus_stack: Vec::new(), // node_desc_to_focus doesn't use this
})
}
}

1
src/shell/mod.rs
View file

@ -2564,6 +2564,7 @@ impl Shell {
handle: from,
node,
stack_window: None,
focus_stack,
},
direction,
);

8
src/shell/workspace.rs
View file

@ -974,7 +974,7 @@ impl Workspace {
.clone()
.map(|node_id| NodeDesc {
handle: self.handle.clone(),
node: node_id,
node: node_id.clone(),
stack_window: if mapped
.stack_ref()
.map(|stack| !stack.whole_stack_focused())
@ -984,16 +984,20 @@ impl Workspace {
} else {
None
},
focus_stack: vec![node_id],
})
} else {
None
}
})
}
KeyboardFocusTarget::Group(WindowGroup { node, .. }) => Some(NodeDesc {
KeyboardFocusTarget::Group(WindowGroup {
node, focus_stack, ..
}) => Some(NodeDesc {
handle: self.handle.clone(),
node,
stack_window: None,
focus_stack,
}),
_ => None,
}