Skip to content

Fix focus loss when destroying a standalone toplevel #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
malbiruk merged 1 commit into from
Apr 18, 2026
Merged

Fix focus loss when destroying a standalone toplevel #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/handlers/xdg_shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,16 @@ impl XdgShellHandler for DriftWm {
.is_some_and(|f| f.0 == wl_surface)
{
let serial = smithay::utils::SERIAL_COUNTER.next_serial();
keyboard.set_focus(self, parent_focus, serial);
// Standalone toplevels have no parent — fall back to the most
// recent previous window so focus does not vanish (important
// with focus_follows_mouse when the pointer is over empty canvas).
let fallback = parent_focus.or_else(|| {
self.focus_history
.iter()
.find(|w| w != &window)
.and_then(|w| w.wl_surface().map(|s| FocusTarget(s.into_owned())))
});
keyboard.set_focus(self, fallback, serial);
}
// If the destroyed window was fullscreen, restore viewport
let fs_output = self.fullscreen.iter()
Expand Down