From 69302bdac2a920bf9b6aca2cc79bf6773c0c1b55 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Sun, 10 Mar 2019 01:29:51 +0800 Subject: [PATCH 1/2] fix command key event left and right reverse on macOS https://github.com/tomaka/winit/issues/808 --- src/platform/macos/events_loop.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/macos/events_loop.rs b/src/platform/macos/events_loop.rs index 358987d619..ffe1af4e2e 100644 --- a/src/platform/macos/events_loop.rs +++ b/src/platform/macos/events_loop.rs @@ -660,8 +660,8 @@ pub fn scancode_to_keycode(code: c_ushort) -> Option { 0x33 => events::VirtualKeyCode::Back, //0x34 => unkown, 0x35 => events::VirtualKeyCode::Escape, - 0x36 => events::VirtualKeyCode::LWin, - 0x37 => events::VirtualKeyCode::RWin, + 0x36 => events::VirtualKeyCode::RWin, + 0x37 => events::VirtualKeyCode::LWin, 0x38 => events::VirtualKeyCode::LShift, //0x39 => Caps lock, 0x3a => events::VirtualKeyCode::LAlt, From f9a5d6651c1390240b2bdf83a71b99a1ecafe500 Mon Sep 17 00:00:00 2001 From: TakWolf Date: Wed, 20 Mar 2019 13:15:59 +0800 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8783afba1c..33a3601df3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Unreleased - On Windows, fix `CursorMoved(0, 0)` getting dispatched on window focus. +- On macOS, fix command key event left and right reverse. # Version 0.19.0 (2019-03-06)