Merge pull request #542 from aentity/winit_023

update to winit 0.23 api

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"
+    NavigateForward,  // also called "Next"
-    NavigateBackward, // 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,

glutin/Cargo.toml

@@ -14,7 +14,7 @@ categories = ["gui"]
 debug = ["iced_winit/debug"]
 
 [dependencies]
-glutin = "0.24"
+glutin = "0.25"
 
 [dependencies.iced_native]
 version = "0.2"

winit/Cargo.toml

@@ -14,7 +14,7 @@ categories = ["gui"]
 debug = ["iced_native/debug"]
 
 [dependencies]
-winit = "0.22"
+winit = "0.23"
 window_clipboard = "0.1"
 log = "0.4"
 thiserror = "1.0"

winit/src/conversion.rs

@@ -127,7 +127,7 @@ pub fn window_event(
 /// [`Mode`]: ../enum.Mode.html
 /// [`winit`]: https://github.com/rust-windowing/winit
 pub fn fullscreen(
-    monitor: winit::monitor::MonitorHandle,
+    monitor: Option<winit::monitor::MonitorHandle>,
     mode: Mode,
 ) -> Option<winit::window::Fullscreen> {
     match mode {
@@ -299,7 +299,8 @@ pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
         winit::event::VirtualKeyCode::Numpad9 => KeyCode::Numpad9,
         winit::event::VirtualKeyCode::AbntC1 => KeyCode::AbntC1,
         winit::event::VirtualKeyCode::AbntC2 => KeyCode::AbntC2,
-        winit::event::VirtualKeyCode::Add => KeyCode::Add,
+        winit::event::VirtualKeyCode::NumpadAdd => KeyCode::NumpadAdd,
+        winit::event::VirtualKeyCode::Plus => KeyCode::Plus,
         winit::event::VirtualKeyCode::Apostrophe => KeyCode::Apostrophe,
         winit::event::VirtualKeyCode::Apps => KeyCode::Apps,
         winit::event::VirtualKeyCode::At => KeyCode::At,
@@ -310,8 +311,8 @@ pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
         winit::event::VirtualKeyCode::Colon => KeyCode::Colon,
         winit::event::VirtualKeyCode::Comma => KeyCode::Comma,
         winit::event::VirtualKeyCode::Convert => KeyCode::Convert,
-        winit::event::VirtualKeyCode::Decimal => KeyCode::Decimal,
+        winit::event::VirtualKeyCode::NumpadDecimal => KeyCode::NumpadDecimal,
-        winit::event::VirtualKeyCode::Divide => KeyCode::Divide,
+        winit::event::VirtualKeyCode::NumpadDivide => KeyCode::NumpadDivide,
         winit::event::VirtualKeyCode::Equals => KeyCode::Equals,
         winit::event::VirtualKeyCode::Grave => KeyCode::Grave,
         winit::event::VirtualKeyCode::Kana => KeyCode::Kana,
@@ -325,7 +326,7 @@ pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
         winit::event::VirtualKeyCode::MediaSelect => KeyCode::MediaSelect,
         winit::event::VirtualKeyCode::MediaStop => KeyCode::MediaStop,
         winit::event::VirtualKeyCode::Minus => KeyCode::Minus,
-        winit::event::VirtualKeyCode::Multiply => KeyCode::Multiply,
+        winit::event::VirtualKeyCode::NumpadMultiply => KeyCode::NumpadMultiply,
         winit::event::VirtualKeyCode::Mute => KeyCode::Mute,
         winit::event::VirtualKeyCode::MyComputer => KeyCode::MyComputer,
         winit::event::VirtualKeyCode::NavigateForward => {
@@ -353,7 +354,7 @@ pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
         winit::event::VirtualKeyCode::Slash => KeyCode::Slash,
         winit::event::VirtualKeyCode::Sleep => KeyCode::Sleep,
         winit::event::VirtualKeyCode::Stop => KeyCode::Stop,
-        winit::event::VirtualKeyCode::Subtract => KeyCode::Subtract,
+        winit::event::VirtualKeyCode::NumpadSubtract => KeyCode::NumpadSubtract,
         winit::event::VirtualKeyCode::Sysrq => KeyCode::Sysrq,
         winit::event::VirtualKeyCode::Tab => KeyCode::Tab,
         winit::event::VirtualKeyCode::Underline => KeyCode::Underline,
@@ -372,6 +373,7 @@ pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
         winit::event::VirtualKeyCode::Copy => KeyCode::Copy,
         winit::event::VirtualKeyCode::Paste => KeyCode::Paste,
         winit::event::VirtualKeyCode::Cut => KeyCode::Cut,
+        winit::event::VirtualKeyCode::Asterisk => KeyCode::Asterisk,
     }
 }
 

winit/src/settings.rs

@@ -64,7 +64,7 @@ impl Window {
         self,
         title: &str,
         mode: Mode,
-        primary_monitor: MonitorHandle,
+        primary_monitor: Option<MonitorHandle>,
     ) -> WindowBuilder {
         let mut window_builder = WindowBuilder::new();