From a605a3f016769ba2fd7e2147fe05c9ac3707f973 Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 23 May 2025 23:08:27 +0300 Subject: Account for hidden pointer in move_cursor() --- src/niri.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/niri.rs b/src/niri.rs index fd8d586a..c1d1b958 100644 --- a/src/niri.rs +++ b/src/niri.rs @@ -740,7 +740,21 @@ impl State { } pub fn move_cursor(&mut self, location: Point) { - let under = self.niri.contents_under(location); + let mut under = match self.niri.pointer_visibility { + PointerVisibility::Disabled => PointContents::default(), + _ => self.niri.contents_under(location), + }; + + // Disable the hidden pointer if the contents underneath have changed. + if !self.niri.pointer_visibility.is_visible() && self.niri.pointer_contents != under { + self.niri.pointer_visibility = PointerVisibility::Disabled; + + // When setting PointerVisibility::Hidden together with pointer contents changing, + // we can change straight to nothing to avoid one frame of hover. Notably, this can + // be triggered through warp-mouse-to-focus combined with hide-when-typing. + under = PointContents::default(); + } + self.niri.pointer_contents.clone_from(&under); let pointer = &self.niri.seat.get_pointer().unwrap(); -- cgit