diff options
author | 2020-10-08 03:55:02 +0200 | |
---|---|---|
committer | 2020-10-08 03:55:02 +0200 | |
commit | 2e0ba65a201da0948e609cf2ddfa3d7a9eea64c7 (patch) | |
tree | a875b3202b98914f2d8fcc9745c6e192dfb83b12 /core | |
parent | c393e450a1e314873667edb32e9ea3775d595c94 (diff) | |
parent | 16cd38a198f8bd94c8957eee9165dde4e8f85c68 (diff) | |
download | iced-2e0ba65a201da0948e609cf2ddfa3d7a9eea64c7.tar.gz iced-2e0ba65a201da0948e609cf2ddfa3d7a9eea64c7.tar.bz2 iced-2e0ba65a201da0948e609cf2ddfa3d7a9eea64c7.zip |
Merge pull request #542 from aentity/winit_023
update to winit 0.23 api
Diffstat (limited to 'core')
-rw-r--r-- | core/src/keyboard/key_code.rs | 37 |
1 files changed, 21 insertions, 16 deletions
diff --git a/core/src/keyboard/key_code.rs b/core/src/keyboard/key_code.rs index 26020a57..74ead170 100644 --- a/core/src/keyboard/key_code.rs +++ b/core/src/keyboard/key_code.rs @@ -55,7 +55,7 @@ pub enum KeyCode { Y, Z, - /// The Escape key, next to F1 + /// The Escape key, next to F1. Escape, F1, @@ -83,14 +83,14 @@ pub enum KeyCode { F23, F24, - /// Print Screen/SysRq + /// Print Screen/SysRq. Snapshot, - /// Scroll Lock + /// Scroll Lock. Scroll, - /// Pause/Break key, next to Scroll lock + /// Pause/Break key, next to Scroll lock. Pause, - /// `Insert`, next to Backspace + /// `Insert`, next to Backspace. Insert, Home, Delete, @@ -103,11 +103,14 @@ pub enum KeyCode { Right, Down, + /// The Backspace key, right over Enter. Backspace, + /// The Enter key. Enter, + /// The space bar. Space, - /// The "Compose" key on Linux + /// The "Compose" key on Linux. Compose, Caret, @@ -123,12 +126,20 @@ pub enum KeyCode { Numpad7, Numpad8, Numpad9, + NumpadAdd, + NumpadDivide, + NumpadDecimal, + NumpadComma, + NumpadEnter, + NumpadEquals, + NumpadMultiply, + NumpadSubtract, AbntC1, AbntC2, - Add, Apostrophe, Apps, + Asterisk, At, Ax, Backslash, @@ -137,8 +148,6 @@ pub enum KeyCode { Colon, Comma, Convert, - Decimal, - Divide, Equals, Grave, Kana, @@ -152,19 +161,16 @@ pub enum KeyCode { MediaSelect, MediaStop, Minus, - Multiply, Mute, MyComputer, - NavigateForward, // also called "Prior" - NavigateBackward, // also called "Next" + NavigateForward, // also called "Next" + NavigateBackward, // also called "Prior" NextTrack, NoConvert, - NumpadComma, - NumpadEnter, - NumpadEquals, OEM102, Period, PlayPause, + Plus, Power, PrevTrack, RAlt, @@ -176,7 +182,6 @@ pub enum KeyCode { Slash, Sleep, Stop, - Subtract, Sysrq, Tab, Underline, |