Merge pull request #542 from aentity/winit_023

update to winit 0.23 api

3 files changed, 10 insertions, 8 deletions

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 06e5df9a..7cf62821 100644
--- a/winit/Cargo.toml
+++ b/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"
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
index 638787ab..de38f246 100644
--- a/winit/src/conversion.rs
+++ b/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::Divide => KeyCode::Divide,
+        winit::event::VirtualKeyCode::NumpadDecimal => KeyCode::NumpadDecimal,
+        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,
     }
 }
 
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index e0d2c569..a6b96ec7 100644
--- a/winit/src/settings.rs
+++ b/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();