From a63b066ed55599ca80e66d405caf52e017552974 Mon Sep 17 00:00:00 2001 From: Mads Marquart Date: Wed, 23 Nov 2022 16:43:56 +0100 Subject: [PATCH] Fix MouseButton::Other value on Windows (#2565) This was a mistake in the transition to windows-sys: https://github.com/rust-windowing/winit/pull/2057 We used winapi's GET_XBUTTON_WPARAM before which is using HIWORD instead of LOWORD: https://docs.rs/winapi/0.3.9/src/winapi/um/winuser.rs.html#1297-1299 --- CHANGELOG.md | 1 + src/platform_impl/windows/mod.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d357e0e8b..c7bcd96c0d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ And please only add new entries to the top of this list, right below the `# Unre # Unreleased +- On Windows, fix the value in `MouseButton::Other`. - On macOS, add `WindowExtMacOS::is_document_edited` and `WindowExtMacOS::set_document_edited` APIs. - **Breaking:** Removed `WindowBuilderExtIOS::with_root_view_class`; instead, you should use `[[view layer] addSublayer: ...]` to add an instance of the desired layer class (e.g. `CAEAGLLayer` or `CAMetalLayer`). See `vulkano-win` or `wgpu` for examples of this. - On MacOS and Windows, add `Window::set_content_protected`. diff --git a/src/platform_impl/windows/mod.rs b/src/platform_impl/windows/mod.rs index 4e0a07a839..0835e7aabf 100644 --- a/src/platform_impl/windows/mod.rs +++ b/src/platform_impl/windows/mod.rs @@ -120,7 +120,7 @@ impl From for WindowId { #[inline(always)] const fn get_xbutton_wparam(x: u32) -> u16 { - loword(x) + hiword(x) } #[inline(always)]