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

xdg_activation: Also consider tiled windows

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-01-02 16:29:21 +01:00 • committed by Victoria Brekenfeld
parent 61b0dddf50
commit e356e3c589
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,7 +116,7 @@ impl XdgActivationHandler for State {
workspace_guard.add_workspace_state(&workspace, WState::Urgent); workspace_guard.add_workspace_state(&workspace, WState::Urgent);
} }
} }
ActivationContext::Workspace(workspace) => { ActivationContext::Workspace(_) => {
let seat = shell.seats.last_active().clone(); let seat = shell.seats.last_active().clone();
let current_output = seat.active_output(); let current_output = seat.active_output();
@ -124,12 +124,13 @@ impl XdgActivationHandler for State {
shell.unminimize_request(&element, &seat); shell.unminimize_request(&element, &seat);
} }
let element_workspace = shell.space_for(&element).map(|w| w.handle.clone());
let current_workspace = shell.active_space_mut(&current_output); let current_workspace = shell.active_space_mut(&current_output);
let in_current_workspace = current_workspace let in_current_workspace = element_workspace
.floating_layer .as_ref()
.mapped() .map(|w| *w == current_workspace.handle)
.any(|m| m == &element); .unwrap_or(false);
if in_current_workspace { if in_current_workspace {
current_workspace current_workspace
@ -157,8 +158,7 @@ impl XdgActivationHandler for State {
std::mem::drop(shell); std::mem::drop(shell);
Shell::set_focus(self, Some(&target), &seat, None, false); Shell::set_focus(self, Some(&target), &seat, None, false);
} else if let Some(w) = shell.space_for(&element).map(|w| w.handle.clone()) } else if let Some(w) = element_workspace {
{
shell.append_focus_stack(&element, &seat); shell.append_focus_stack(&element, &seat);
let mut workspace_guard = self.common.workspace_state.update(); let mut workspace_guard = self.common.workspace_state.update();
workspace_guard.add_workspace_state(&w, WState::Urgent); workspace_guard.add_workspace_state(&w, WState::Urgent);