From de6caec685a304045b04db16e23eb5928685de6c Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 5 Jul 2024 10:13:50 +0400 Subject: Recompute current pointer focus for focus-follows-mouse Fixes https://github.com/YaLTeR/niri/issues/377. --- src/niri.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/niri.rs b/src/niri.rs index 177f5765..08331bef 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -4144,18 +4144,22 @@ impl Niri { return; } - if self.seat.get_pointer().unwrap().is_grabbed() { + let pointer = &self.seat.get_pointer().unwrap(); + if pointer.is_grabbed() { return; } + // Recompute the current pointer focus because we don't update it during animations. + let current_focus = self.surface_under_and_global_space(pointer.current_location()); + if let Some(output) = &new_focus.output { - if self.pointer_focus.output.as_ref() != Some(output) { + if current_focus.output.as_ref() != Some(output) { self.layout.focus_output(output); } } if let Some(window) = &new_focus.window { - if self.pointer_focus.window.as_ref() != Some(window) { + if current_focus.window.as_ref() != Some(window) { self.layout.activate_window(window); } } -- cgit