wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-27 12:23:46 +03:00
Code Issues Projects Releases Wiki Activity

macos: use alternative cursor hiding technique

Browse Source 
NSCursor hide/unhide must be perfectly balanced otherwise
the cursor can vanish unexpectedly when the mouse leaves
the window, and not come back.

So, let's use NSCursor:setHiddenUntilMouseMoves instead; it's
not 100% fulfilling the promise of the API, but it's close enough
and should avoid the permanent invisibility issue.

refs: https://github.com/wez/wezterm/issues/618
This commit is contained in:
Wez Furlong 2021-04-10 14:30:06 -07:00
parent 33ca16df44
commit 2bb0e4e797
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
window/src/os/macos/window.rs
View File

@ -321,7 +321,6 @@ pub(crate) struct WindowInner {
view: StrongPtr,
window: StrongPtr,
config: ConfigHandle,
cursor: Option<MouseCursor>,
}
fn function_key_to_keycode(function_key: char) -> KeyCode {
@ -457,7 +456,6 @@ impl Window {
window,
view,
config: config.clone(),
cursor: Some(MouseCursor::Arrow),
}));
inner.borrow_mut().window.replace(weak_window);
conn.windows
@ -802,18 +800,12 @@ impl WindowOpsMut for WindowInner {
MouseCursor::SizeUpDown => msg_send![ns_cursor_cls, resizeUpDownCursor],
MouseCursor::SizeLeftRight => msg_send![ns_cursor_cls, resizeLeftRightCursor],
};
let () = msg_send![ns_cursor_cls, setHiddenUntilMouseMoves: NO];
let () = msg_send![instance, set];
if self.cursor.is_none() {
// If we believe that it was hidden previously, unhide it.
let () = msg_send![ns_cursor_cls, unhide];
}
} else if self.cursor.is_some() {
// If we believe that it was shown previously, hide it.
let () = msg_send![ns_cursor_cls, hide];
} else {
let () = msg_send![ns_cursor_cls, setHiddenUntilMouseMoves: YES];
}
}
self.cursor = cursor;
}
fn invalidate(&mut self) {