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

focus-stack: Keep dragged surface in focus stack in move_request()

Browse source 
Replacement for https://github.com/pop-os/cosmic-comp/pull/1687, that
works correctly with multiple outputs.

We don't want another window to show a focus indicator while a window is
being dragged, so keep the window in the focus stack. If a window is
being moved out of a stack, change the focus from the stack to the
window.

`refresh_focus_stack()` doesn't seem to be called here, but for good
measure, make sure that calling that function also won't remove a
`CosmicMapped` from the focus stack if it is currently part of a move
grab for the seat.
This commit is contained in:
Ian Douglas Scott 2025-10-30 13:59:26 -07:00 • committed by Ian Douglas Scott
parent e09fcec9f3
commit 7fd033295f
3 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/shell/mod.rs
View file

@ -3415,15 +3415,6 @@ impl Shell {
return None;
}
if !move_out_of_stack {
for workspace in self.workspaces.spaces_mut() {
for seat in self.seats.iter() {
let mut stack = workspace.focus_stack.get_mut(seat);
stack.remove(&old_mapped);
}
}
}
let (window, _) = old_mapped
.windows()
.find(|(w, _)| w.wl_surface().as_deref() == Some(surface))
@ -3441,6 +3432,15 @@ impl Shell {
old_mapped.clone()
};
if move_out_of_stack {
// Update focus stack to set focus to the window being dragged out of
// the stack.
if let Some(workspace) = self.space_for_mut(&old_mapped) {
let mut stack = workspace.focus_stack.get_mut(seat);
stack.append(mapped.clone());
}
}
let trigger = match &start_data {
GrabStartData::Pointer(start_data) => Trigger::Pointer(start_data.button),
GrabStartData::Touch(start_data) => Trigger::Touch(start_data.slot),