Merge pull request #1378 from hvox/master

Fix bug in Keycode type
Rust-SDL2 · Jun 13, 2024 · ba37d2e · ba37d2e
2 parents f3083ef + ef2e678
commit ba37d2e
Show file tree

Hide file tree

Showing 4 changed files with 457 additions and 481 deletions.
diff --git a/changelog.md b/changelog.md
@@ -3,6 +3,8 @@ when upgrading from a version of rust-sdl2 to another.
 
 ### Unreleased
 
+[PR #1378](https://github.com/Rust-SDL2/rust-sdl2/pull/1378) **BREAKING CHANGE** Change `Keycode` to be a struct rather than an enum. Fix `Keycode::from_scancode` for non-QWERTY keyboard layouts.
+
 [PR #1368](https://github.com/Rust-SDL2/rust-sdl2/pull/1368) Remove unnecessary unsafe in Window interface. Make Window `Clone`.
 
 [PR #1366](https://github.com/Rust-SDL2/rust-sdl2/pull/1366) Add Primary Selection bindings.

diff --git a/src/sdl2/event.rs b/src/sdl2/event.rs
@@ -960,7 +960,7 @@ where
         .unwrap_or(sys::SDL_Scancode::SDL_SCANCODE_UNKNOWN);
     let keycode = keycode
         .into()
-        .map(|kc| kc as sys::SDL_Keycode)
+        .map(|kc| kc.into())
         .unwrap_or(sys::SDL_KeyCode::SDLK_UNKNOWN as i32);
     let keymod = keymod.bits() as u16;
     sys::SDL_Keysym {