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

fix: set the workspace of the activated token's surface to urgent if not focusing it

Browse source
This commit is contained in:
Ashley Wulber 2023-11-16 12:00:27 -05:00 • committed by Victoria Brekenfeld
parent b33c1dc9f7
commit 495d772a38
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/wayland/handlers/xdg_activation.rs
View file

@ -117,11 +117,12 @@ impl XdgActivationHandler for State {
let current_output = seat.active_output();
let current_workspace = self.common.shell.active_space_mut(&current_output);
if current_workspace
let in_current_workspace = current_workspace
.floating_layer
.mapped()
.any(|m| m == &element)
{
.any(|m| m == &element);
if in_current_workspace {
current_workspace
.floating_layer
.space
@ -143,11 +144,14 @@ impl XdgActivationHandler for State {
}
let target = element.into();
if workspace == &current_workspace.handle {
if workspace == &current_workspace.handle && in_current_workspace {
Shell::set_focus(self, Some(&target), &seat, None);
} else {
} else if let Some((w, _)) = target
.toplevel()
.and_then(|t| self.common.shell.workspace_for_surface(&t))
{
Shell::append_focus_stack(self, Some(&target), &seat);
self.common.shell.set_urgent(workspace);
self.common.shell.set_urgent(&w);
}
}
}