Skip to content

Commit

Permalink
Fix MouseButton::Other value on Windows (#2565)
Browse files Browse the repository at this point in the history
This was a mistake in the transition to windows-sys: #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
  • Loading branch information
madsmtm committed Nov 23, 2022
1 parent f77f858 commit a63b066
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -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`.
Expand Down
2 changes: 1 addition & 1 deletion src/platform_impl/windows/mod.rs
Expand Up @@ -120,7 +120,7 @@ impl From<u64> for WindowId {

#[inline(always)]
const fn get_xbutton_wparam(x: u32) -> u16 {
loword(x)
hiword(x)
}

#[inline(always)]
Expand Down

0 comments on commit a63b066

Please sign in to comment.