alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-24 06:11:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

On Windows, set the cursor icon when the cursor first enters a window (#1807)

Browse source
This commit is contained in:
Markus Røyset 2021-01-05 17:39:13 +01:00 committed by GitHub
parent 38fccebe1f
commit 9d63fc7ca0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -1,5 +1,6 @@
# Unreleased # Unreleased
- On Windows, fix bug causing newly created windows to erroneously display the "wait" (spinning) cursor.
- On Windows, change the default window size (1024x768) to match the default on other desktop platforms (800x600). - On Windows, change the default window size (1024x768) to match the default on other desktop platforms (800x600).
- On Windows, fix bug causing mouse capture to not be released. - On Windows, fix bug causing mouse capture to not be released.
- On Windows, fix fullscreen not preserving minimized/maximized state. - On Windows, fix fullscreen not preserving minimized/maximized state.

12
src/platform_impl/windows/event_loop.rs
View file

@ -20,7 +20,7 @@ use winapi::shared::basetsd::{DWORD_PTR, UINT_PTR};
use winapi::{ use winapi::{
shared::{ shared::{
minwindef::{BOOL, DWORD, HIWORD, INT, LOWORD, LPARAM, LRESULT, UINT, WPARAM}, minwindef::{BOOL, DWORD, HIWORD, INT, LOWORD, LPARAM, LRESULT, UINT, WORD, WPARAM},
windef::{HWND, POINT, RECT}, windef::{HWND, POINT, RECT},
windowsx, winerror, windowsx, winerror,
}, },
@ -1664,11 +1664,11 @@ unsafe fn public_window_callback_inner<T: 'static>(
winuser::WM_SETCURSOR => { winuser::WM_SETCURSOR => {
let set_cursor_to = { let set_cursor_to = {
let window_state = subclass_input.window_state.lock(); let window_state = subclass_input.window_state.lock();
if window_state // The return value for the preceding `WM_NCHITTEST` message is conveniently
.mouse // provided through the low-order word of lParam. We use that here since
.cursor_flags() // `WM_MOUSEMOVE` seems to come after `WM_SETCURSOR` for a given cursor movement.
.contains(CursorFlags::IN_WINDOW) let in_client_area = LOWORD(lparam as DWORD) == winuser::HTCLIENT as WORD;
{ if in_client_area {
Some(window_state.mouse.cursor) Some(window_state.mouse.cursor)
} else { } else {
None None