Update winit

slint-ui · Oct 3, 2020 · 57ccd26 · 57ccd26
1 parent fcd5d11
commit 57ccd26
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/sixtyfps_runtime/corelib/Cargo.toml b/sixtyfps_runtime/corelib/Cargo.toml
@@ -22,7 +22,7 @@ cgmath = "0.17.0"
 const-field-offset = { version = "0.1", path = "../../helper_crates/const-field-offset" }
 vtable = { version="0.1", path = "../../helper_crates/vtable" }
 sixtyfps-corelib-macros = { version = "=0.0.1", path = "../corelib_macros" }
-winit = "0.22.1"
+winit = "0.23"
 lyon = { version = "0.16" }
 euclid = "0.22.1"
 triomphe = "0.1.1"

diff --git a/sixtyfps_runtime/corelib/input.rs b/sixtyfps_runtime/corelib/input.rs
@@ -173,9 +173,10 @@ pub enum KeyCode {
     Numpad9,
     AbntC1,
     AbntC2,
-    Add,
+    NumpadAdd,
     Apostrophe,
     Apps,
+    Asterisk,
     At,
     Ax,
     Backslash,
@@ -184,8 +185,8 @@ pub enum KeyCode {
     Colon,
     Comma,
     Convert,
-    Decimal,
-    Divide,
+    NumpadDecimal,
+    NumpadDivide,
     Equals,
     Grave,
     Kana,
@@ -199,7 +200,7 @@ pub enum KeyCode {
     MediaSelect,
     MediaStop,
     Minus,
-    Multiply,
+    NumpadMultiply,
     Mute,
     MyComputer,
     NavigateForward,
@@ -212,6 +213,7 @@ pub enum KeyCode {
     OEM102,
     Period,
     PlayPause,
+    Plus,
     Power,
     PrevTrack,
     RAlt,
@@ -223,7 +225,7 @@ pub enum KeyCode {
     Slash,
     Sleep,
     Stop,
-    Subtract,
+    NumpadSubtract,
     Sysrq,
     Tab,
     Underline,

diff --git a/sixtyfps_runtime/rendering_backends/gl/Cargo.toml b/sixtyfps_runtime/rendering_backends/gl/Cargo.toml
@@ -26,12 +26,12 @@ smallvec = "1.4.1"
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web_sys = { version = "0.3", package = "web-sys", features=["console"] }
 wasm-bindgen = { version = "0.2" }
-winit = { version = "0.22.1", features = ["web-sys"] }
+winit = { version = "0.23", features = ["web-sys"] }
 glow = { version = "0.6.0", features = ["web-sys"], default-features = false }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-winit = "0.22.1"
-glutin = { version = "0.24" }
+winit = { version = "0.23" }
+glutin = { version = "0.25" }
 glow = { version = "0.6.0", default-features = false }
 
 [target.'cfg(target_os = "macos")'.dependencies]