Move `winit` conversions to `iced_winit`

7 files changed, 201 insertions, 225 deletions

diff --git a/native/Cargo.toml b/native/Cargo.toml
index 07c14535..6870649a 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -15,6 +15,3 @@ iced_core = { version = "0.1.0-alpha", path = "../core" }
 stretch = "0.2"
 twox-hash = "1.5"
 raw-window-handle = "0.1"
-
-# Enable to obtain conversion traits
-winit = { version = "0.20.0-alpha3", optional = true }
diff --git a/native/src/input/button_state.rs b/native/src/input/button_state.rs
index e9dc05d7..988043ba 100644
--- a/native/src/input/button_state.rs
+++ b/native/src/input/button_state.rs
@@ -1,9 +1,4 @@
 /// The state of a button.
-///
-/// If you are using [`winit`], consider enabling the `winit` feature to get
-/// conversion implementations for free!
-///
-/// [`winit`]: https://docs.rs/winit/0.20.0-alpha3/winit/
 #[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy)]
 pub enum ButtonState {
     /// The button is pressed.
@@ -12,13 +7,3 @@ pub enum ButtonState {
     /// The button is __not__ pressed.
     Released,
 }
-
-#[cfg(feature = "winit")]
-impl From<winit::event::ElementState> for ButtonState {
-    fn from(element_state: winit::event::ElementState) -> Self {
-        match element_state {
-            winit::event::ElementState::Pressed => ButtonState::Pressed,
-            winit::event::ElementState::Released => ButtonState::Released,
-        }
-    }
-}
diff --git a/native/src/input/keyboard/key_code.rs b/native/src/input/keyboard/key_code.rs
index 207ddeac..26020a57 100644
--- a/native/src/input/keyboard/key_code.rs
+++ b/native/src/input/keyboard/key_code.rs
@@ -2,9 +2,6 @@
 ///
 /// This is mostly the `KeyCode` type found in [`winit`].
 ///
-/// If you are using [`winit`], consider enabling the `winit` feature to get
-/// conversion implementations for free!
-///
 /// [`winit`]: https://docs.rs/winit/0.20.0-alpha3/winit/
 #[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy)]
 #[repr(u32)]
@@ -199,176 +196,3 @@ pub enum KeyCode {
     Paste,
     Cut,
 }
-
-#[cfg(feature = "winit")]
-impl From<winit::event::VirtualKeyCode> for KeyCode {
-    fn from(virtual_keycode: winit::event::VirtualKeyCode) -> Self {
-        match virtual_keycode {
-            winit::event::VirtualKeyCode::Key1 => KeyCode::Key1,
-            winit::event::VirtualKeyCode::Key2 => KeyCode::Key2,
-            winit::event::VirtualKeyCode::Key3 => KeyCode::Key3,
-            winit::event::VirtualKeyCode::Key4 => KeyCode::Key4,
-            winit::event::VirtualKeyCode::Key5 => KeyCode::Key5,
-            winit::event::VirtualKeyCode::Key6 => KeyCode::Key6,
-            winit::event::VirtualKeyCode::Key7 => KeyCode::Key7,
-            winit::event::VirtualKeyCode::Key8 => KeyCode::Key8,
-            winit::event::VirtualKeyCode::Key9 => KeyCode::Key9,
-            winit::event::VirtualKeyCode::Key0 => KeyCode::Key0,
-            winit::event::VirtualKeyCode::A => KeyCode::A,
-            winit::event::VirtualKeyCode::B => KeyCode::B,
-            winit::event::VirtualKeyCode::C => KeyCode::C,
-            winit::event::VirtualKeyCode::D => KeyCode::D,
-            winit::event::VirtualKeyCode::E => KeyCode::E,
-            winit::event::VirtualKeyCode::F => KeyCode::F,
-            winit::event::VirtualKeyCode::G => KeyCode::G,
-            winit::event::VirtualKeyCode::H => KeyCode::H,
-            winit::event::VirtualKeyCode::I => KeyCode::I,
-            winit::event::VirtualKeyCode::J => KeyCode::J,
-            winit::event::VirtualKeyCode::K => KeyCode::K,
-            winit::event::VirtualKeyCode::L => KeyCode::L,
-            winit::event::VirtualKeyCode::M => KeyCode::M,
-            winit::event::VirtualKeyCode::N => KeyCode::N,
-            winit::event::VirtualKeyCode::O => KeyCode::O,
-            winit::event::VirtualKeyCode::P => KeyCode::P,
-            winit::event::VirtualKeyCode::Q => KeyCode::Q,
-            winit::event::VirtualKeyCode::R => KeyCode::R,
-            winit::event::VirtualKeyCode::S => KeyCode::S,
-            winit::event::VirtualKeyCode::T => KeyCode::T,
-            winit::event::VirtualKeyCode::U => KeyCode::U,
-            winit::event::VirtualKeyCode::V => KeyCode::V,
-            winit::event::VirtualKeyCode::W => KeyCode::W,
-            winit::event::VirtualKeyCode::X => KeyCode::X,
-            winit::event::VirtualKeyCode::Y => KeyCode::Y,
-            winit::event::VirtualKeyCode::Z => KeyCode::Z,
-            winit::event::VirtualKeyCode::Escape => KeyCode::Escape,
-            winit::event::VirtualKeyCode::F1 => KeyCode::F1,
-            winit::event::VirtualKeyCode::F2 => KeyCode::F2,
-            winit::event::VirtualKeyCode::F3 => KeyCode::F3,
-            winit::event::VirtualKeyCode::F4 => KeyCode::F4,
-            winit::event::VirtualKeyCode::F5 => KeyCode::F5,
-            winit::event::VirtualKeyCode::F6 => KeyCode::F6,
-            winit::event::VirtualKeyCode::F7 => KeyCode::F7,
-            winit::event::VirtualKeyCode::F8 => KeyCode::F8,
-            winit::event::VirtualKeyCode::F9 => KeyCode::F9,
-            winit::event::VirtualKeyCode::F10 => KeyCode::F10,
-            winit::event::VirtualKeyCode::F11 => KeyCode::F11,
-            winit::event::VirtualKeyCode::F12 => KeyCode::F12,
-            winit::event::VirtualKeyCode::F13 => KeyCode::F13,
-            winit::event::VirtualKeyCode::F14 => KeyCode::F14,
-            winit::event::VirtualKeyCode::F15 => KeyCode::F15,
-            winit::event::VirtualKeyCode::F16 => KeyCode::F16,
-            winit::event::VirtualKeyCode::F17 => KeyCode::F17,
-            winit::event::VirtualKeyCode::F18 => KeyCode::F18,
-            winit::event::VirtualKeyCode::F19 => KeyCode::F19,
-            winit::event::VirtualKeyCode::F20 => KeyCode::F20,
-            winit::event::VirtualKeyCode::F21 => KeyCode::F21,
-            winit::event::VirtualKeyCode::F22 => KeyCode::F22,
-            winit::event::VirtualKeyCode::F23 => KeyCode::F23,
-            winit::event::VirtualKeyCode::F24 => KeyCode::F24,
-            winit::event::VirtualKeyCode::Snapshot => KeyCode::Snapshot,
-            winit::event::VirtualKeyCode::Scroll => KeyCode::Scroll,
-            winit::event::VirtualKeyCode::Pause => KeyCode::Pause,
-            winit::event::VirtualKeyCode::Insert => KeyCode::Insert,
-            winit::event::VirtualKeyCode::Home => KeyCode::Home,
-            winit::event::VirtualKeyCode::Delete => KeyCode::Delete,
-            winit::event::VirtualKeyCode::End => KeyCode::End,
-            winit::event::VirtualKeyCode::PageDown => KeyCode::PageDown,
-            winit::event::VirtualKeyCode::PageUp => KeyCode::PageUp,
-            winit::event::VirtualKeyCode::Left => KeyCode::Left,
-            winit::event::VirtualKeyCode::Up => KeyCode::Up,
-            winit::event::VirtualKeyCode::Right => KeyCode::Right,
-            winit::event::VirtualKeyCode::Down => KeyCode::Down,
-            winit::event::VirtualKeyCode::Back => KeyCode::Backspace,
-            winit::event::VirtualKeyCode::Return => KeyCode::Enter,
-            winit::event::VirtualKeyCode::Space => KeyCode::Space,
-            winit::event::VirtualKeyCode::Compose => KeyCode::Compose,
-            winit::event::VirtualKeyCode::Caret => KeyCode::Caret,
-            winit::event::VirtualKeyCode::Numlock => KeyCode::Numlock,
-            winit::event::VirtualKeyCode::Numpad0 => KeyCode::Numpad0,
-            winit::event::VirtualKeyCode::Numpad1 => KeyCode::Numpad1,
-            winit::event::VirtualKeyCode::Numpad2 => KeyCode::Numpad2,
-            winit::event::VirtualKeyCode::Numpad3 => KeyCode::Numpad3,
-            winit::event::VirtualKeyCode::Numpad4 => KeyCode::Numpad4,
-            winit::event::VirtualKeyCode::Numpad5 => KeyCode::Numpad5,
-            winit::event::VirtualKeyCode::Numpad6 => KeyCode::Numpad6,
-            winit::event::VirtualKeyCode::Numpad7 => KeyCode::Numpad7,
-            winit::event::VirtualKeyCode::Numpad8 => KeyCode::Numpad8,
-            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::Apostrophe => KeyCode::Apostrophe,
-            winit::event::VirtualKeyCode::Apps => KeyCode::Apps,
-            winit::event::VirtualKeyCode::At => KeyCode::At,
-            winit::event::VirtualKeyCode::Ax => KeyCode::Ax,
-            winit::event::VirtualKeyCode::Backslash => KeyCode::Backslash,
-            winit::event::VirtualKeyCode::Calculator => KeyCode::Calculator,
-            winit::event::VirtualKeyCode::Capital => KeyCode::Capital,
-            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::Equals => KeyCode::Equals,
-            winit::event::VirtualKeyCode::Grave => KeyCode::Grave,
-            winit::event::VirtualKeyCode::Kana => KeyCode::Kana,
-            winit::event::VirtualKeyCode::Kanji => KeyCode::Kanji,
-            winit::event::VirtualKeyCode::LAlt => KeyCode::LAlt,
-            winit::event::VirtualKeyCode::LBracket => KeyCode::LBracket,
-            winit::event::VirtualKeyCode::LControl => KeyCode::LControl,
-            winit::event::VirtualKeyCode::LShift => KeyCode::LShift,
-            winit::event::VirtualKeyCode::LWin => KeyCode::LWin,
-            winit::event::VirtualKeyCode::Mail => KeyCode::Mail,
-            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::Mute => KeyCode::Mute,
-            winit::event::VirtualKeyCode::MyComputer => KeyCode::MyComputer,
-            winit::event::VirtualKeyCode::NavigateForward => {
-                KeyCode::NavigateForward
-            }
-            winit::event::VirtualKeyCode::NavigateBackward => {
-                KeyCode::NavigateBackward
-            }
-            winit::event::VirtualKeyCode::NextTrack => KeyCode::NextTrack,
-            winit::event::VirtualKeyCode::NoConvert => KeyCode::NoConvert,
-            winit::event::VirtualKeyCode::NumpadComma => KeyCode::NumpadComma,
-            winit::event::VirtualKeyCode::NumpadEnter => KeyCode::NumpadEnter,
-            winit::event::VirtualKeyCode::NumpadEquals => KeyCode::NumpadEquals,
-            winit::event::VirtualKeyCode::OEM102 => KeyCode::OEM102,
-            winit::event::VirtualKeyCode::Period => KeyCode::Period,
-            winit::event::VirtualKeyCode::PlayPause => KeyCode::PlayPause,
-            winit::event::VirtualKeyCode::Power => KeyCode::Power,
-            winit::event::VirtualKeyCode::PrevTrack => KeyCode::PrevTrack,
-            winit::event::VirtualKeyCode::RAlt => KeyCode::RAlt,
-            winit::event::VirtualKeyCode::RBracket => KeyCode::RBracket,
-            winit::event::VirtualKeyCode::RControl => KeyCode::RControl,
-            winit::event::VirtualKeyCode::RShift => KeyCode::RShift,
-            winit::event::VirtualKeyCode::RWin => KeyCode::RWin,
-            winit::event::VirtualKeyCode::Semicolon => KeyCode::Semicolon,
-            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::Sysrq => KeyCode::Sysrq,
-            winit::event::VirtualKeyCode::Tab => KeyCode::Tab,
-            winit::event::VirtualKeyCode::Underline => KeyCode::Underline,
-            winit::event::VirtualKeyCode::Unlabeled => KeyCode::Unlabeled,
-            winit::event::VirtualKeyCode::VolumeDown => KeyCode::VolumeDown,
-            winit::event::VirtualKeyCode::VolumeUp => KeyCode::VolumeUp,
-            winit::event::VirtualKeyCode::Wake => KeyCode::Wake,
-            winit::event::VirtualKeyCode::WebBack => KeyCode::WebBack,
-            winit::event::VirtualKeyCode::WebFavorites => KeyCode::WebFavorites,
-            winit::event::VirtualKeyCode::WebForward => KeyCode::WebForward,
-            winit::event::VirtualKeyCode::WebHome => KeyCode::WebHome,
-            winit::event::VirtualKeyCode::WebRefresh => KeyCode::WebRefresh,
-            winit::event::VirtualKeyCode::WebSearch => KeyCode::WebSearch,
-            winit::event::VirtualKeyCode::WebStop => KeyCode::WebStop,
-            winit::event::VirtualKeyCode::Yen => KeyCode::Yen,
-            winit::event::VirtualKeyCode::Copy => KeyCode::Copy,
-            winit::event::VirtualKeyCode::Paste => KeyCode::Paste,
-            winit::event::VirtualKeyCode::Cut => KeyCode::Cut,
-        }
-    }
-}
diff --git a/native/src/input/mouse/button.rs b/native/src/input/mouse/button.rs
index 6320d701..aeb8a55d 100644
--- a/native/src/input/mouse/button.rs
+++ b/native/src/input/mouse/button.rs
@@ -1,9 +1,4 @@
 /// The button of a mouse.
-///
-/// If you are using [`winit`], consider enabling the `winit` feature to get
-/// conversion implementations for free!
-///
-/// [`winit`]: https://docs.rs/winit/0.20.0-alpha3/winit/
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)]
 pub enum Button {
     /// The left mouse button.
@@ -18,15 +13,3 @@ pub enum Button {
     /// Some other button.
     Other(u8),
 }
-
-#[cfg(feature = "winit")]
-impl From<winit::event::MouseButton> for super::Button {
-    fn from(mouse_button: winit::event::MouseButton) -> Self {
-        match mouse_button {
-            winit::event::MouseButton::Left => Button::Left,
-            winit::event::MouseButton::Right => Button::Right,
-            winit::event::MouseButton::Middle => Button::Middle,
-            winit::event::MouseButton::Other(other) => Button::Other(other),
-        }
-    }
-}
diff --git a/native/src/mouse_cursor.rs b/native/src/mouse_cursor.rs
index 4ef6361a..f6a68c54 100644
--- a/native/src/mouse_cursor.rs
+++ b/native/src/mouse_cursor.rs
@@ -19,17 +19,3 @@ pub enum MouseCursor {
     /// The cursor is grabbing a widget.
     Grabbing,
 }
-
-#[cfg(feature = "winit")]
-impl From<MouseCursor> for winit::window::CursorIcon {
-    fn from(mouse_cursor: MouseCursor) -> winit::window::CursorIcon {
-        match mouse_cursor {
-            MouseCursor::OutOfBounds => winit::window::CursorIcon::Default,
-            MouseCursor::Idle => winit::window::CursorIcon::Default,
-            MouseCursor::Pointer => winit::window::CursorIcon::Hand,
-            MouseCursor::Working => winit::window::CursorIcon::Progress,
-            MouseCursor::Grab => winit::window::CursorIcon::Grab,
-            MouseCursor::Grabbing => winit::window::CursorIcon::Grabbing,
-        }
-    }
-}
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs
new file mode 100644
index 00000000..bb0d252e
--- /dev/null
+++ b/winit/src/conversion.rs
@@ -0,0 +1,199 @@
+use crate::input::{keyboard::KeyCode, mouse, ButtonState};
+use crate::MouseCursor;
+
+pub fn mouse_cursor(mouse_cursor: MouseCursor) -> winit::window::CursorIcon {
+    match mouse_cursor {
+        MouseCursor::OutOfBounds => winit::window::CursorIcon::Default,
+        MouseCursor::Idle => winit::window::CursorIcon::Default,
+        MouseCursor::Pointer => winit::window::CursorIcon::Hand,
+        MouseCursor::Working => winit::window::CursorIcon::Progress,
+        MouseCursor::Grab => winit::window::CursorIcon::Grab,
+        MouseCursor::Grabbing => winit::window::CursorIcon::Grabbing,
+    }
+}
+
+pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
+    match mouse_button {
+        winit::event::MouseButton::Left => mouse::Button::Left,
+        winit::event::MouseButton::Right => mouse::Button::Right,
+        winit::event::MouseButton::Middle => mouse::Button::Middle,
+        winit::event::MouseButton::Other(other) => mouse::Button::Other(other),
+    }
+}
+
+pub fn button_state(element_state: winit::event::ElementState) -> ButtonState {
+    match element_state {
+        winit::event::ElementState::Pressed => ButtonState::Pressed,
+        winit::event::ElementState::Released => ButtonState::Released,
+    }
+}
+
+pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
+    match virtual_keycode {
+        winit::event::VirtualKeyCode::Key1 => KeyCode::Key1,
+        winit::event::VirtualKeyCode::Key2 => KeyCode::Key2,
+        winit::event::VirtualKeyCode::Key3 => KeyCode::Key3,
+        winit::event::VirtualKeyCode::Key4 => KeyCode::Key4,
+        winit::event::VirtualKeyCode::Key5 => KeyCode::Key5,
+        winit::event::VirtualKeyCode::Key6 => KeyCode::Key6,
+        winit::event::VirtualKeyCode::Key7 => KeyCode::Key7,
+        winit::event::VirtualKeyCode::Key8 => KeyCode::Key8,
+        winit::event::VirtualKeyCode::Key9 => KeyCode::Key9,
+        winit::event::VirtualKeyCode::Key0 => KeyCode::Key0,
+        winit::event::VirtualKeyCode::A => KeyCode::A,
+        winit::event::VirtualKeyCode::B => KeyCode::B,
+        winit::event::VirtualKeyCode::C => KeyCode::C,
+        winit::event::VirtualKeyCode::D => KeyCode::D,
+        winit::event::VirtualKeyCode::E => KeyCode::E,
+        winit::event::VirtualKeyCode::F => KeyCode::F,
+        winit::event::VirtualKeyCode::G => KeyCode::G,
+        winit::event::VirtualKeyCode::H => KeyCode::H,
+        winit::event::VirtualKeyCode::I => KeyCode::I,
+        winit::event::VirtualKeyCode::J => KeyCode::J,
+        winit::event::VirtualKeyCode::K => KeyCode::K,
+        winit::event::VirtualKeyCode::L => KeyCode::L,
+        winit::event::VirtualKeyCode::M => KeyCode::M,
+        winit::event::VirtualKeyCode::N => KeyCode::N,
+        winit::event::VirtualKeyCode::O => KeyCode::O,
+        winit::event::VirtualKeyCode::P => KeyCode::P,
+        winit::event::VirtualKeyCode::Q => KeyCode::Q,
+        winit::event::VirtualKeyCode::R => KeyCode::R,
+        winit::event::VirtualKeyCode::S => KeyCode::S,
+        winit::event::VirtualKeyCode::T => KeyCode::T,
+        winit::event::VirtualKeyCode::U => KeyCode::U,
+        winit::event::VirtualKeyCode::V => KeyCode::V,
+        winit::event::VirtualKeyCode::W => KeyCode::W,
+        winit::event::VirtualKeyCode::X => KeyCode::X,
+        winit::event::VirtualKeyCode::Y => KeyCode::Y,
+        winit::event::VirtualKeyCode::Z => KeyCode::Z,
+        winit::event::VirtualKeyCode::Escape => KeyCode::Escape,
+        winit::event::VirtualKeyCode::F1 => KeyCode::F1,
+        winit::event::VirtualKeyCode::F2 => KeyCode::F2,
+        winit::event::VirtualKeyCode::F3 => KeyCode::F3,
+        winit::event::VirtualKeyCode::F4 => KeyCode::F4,
+        winit::event::VirtualKeyCode::F5 => KeyCode::F5,
+        winit::event::VirtualKeyCode::F6 => KeyCode::F6,
+        winit::event::VirtualKeyCode::F7 => KeyCode::F7,
+        winit::event::VirtualKeyCode::F8 => KeyCode::F8,
+        winit::event::VirtualKeyCode::F9 => KeyCode::F9,
+        winit::event::VirtualKeyCode::F10 => KeyCode::F10,
+        winit::event::VirtualKeyCode::F11 => KeyCode::F11,
+        winit::event::VirtualKeyCode::F12 => KeyCode::F12,
+        winit::event::VirtualKeyCode::F13 => KeyCode::F13,
+        winit::event::VirtualKeyCode::F14 => KeyCode::F14,
+        winit::event::VirtualKeyCode::F15 => KeyCode::F15,
+        winit::event::VirtualKeyCode::F16 => KeyCode::F16,
+        winit::event::VirtualKeyCode::F17 => KeyCode::F17,
+        winit::event::VirtualKeyCode::F18 => KeyCode::F18,
+        winit::event::VirtualKeyCode::F19 => KeyCode::F19,
+        winit::event::VirtualKeyCode::F20 => KeyCode::F20,
+        winit::event::VirtualKeyCode::F21 => KeyCode::F21,
+        winit::event::VirtualKeyCode::F22 => KeyCode::F22,
+        winit::event::VirtualKeyCode::F23 => KeyCode::F23,
+        winit::event::VirtualKeyCode::F24 => KeyCode::F24,
+        winit::event::VirtualKeyCode::Snapshot => KeyCode::Snapshot,
+        winit::event::VirtualKeyCode::Scroll => KeyCode::Scroll,
+        winit::event::VirtualKeyCode::Pause => KeyCode::Pause,
+        winit::event::VirtualKeyCode::Insert => KeyCode::Insert,
+        winit::event::VirtualKeyCode::Home => KeyCode::Home,
+        winit::event::VirtualKeyCode::Delete => KeyCode::Delete,
+        winit::event::VirtualKeyCode::End => KeyCode::End,
+        winit::event::VirtualKeyCode::PageDown => KeyCode::PageDown,
+        winit::event::VirtualKeyCode::PageUp => KeyCode::PageUp,
+        winit::event::VirtualKeyCode::Left => KeyCode::Left,
+        winit::event::VirtualKeyCode::Up => KeyCode::Up,
+        winit::event::VirtualKeyCode::Right => KeyCode::Right,
+        winit::event::VirtualKeyCode::Down => KeyCode::Down,
+        winit::event::VirtualKeyCode::Back => KeyCode::Backspace,
+        winit::event::VirtualKeyCode::Return => KeyCode::Enter,
+        winit::event::VirtualKeyCode::Space => KeyCode::Space,
+        winit::event::VirtualKeyCode::Compose => KeyCode::Compose,
+        winit::event::VirtualKeyCode::Caret => KeyCode::Caret,
+        winit::event::VirtualKeyCode::Numlock => KeyCode::Numlock,
+        winit::event::VirtualKeyCode::Numpad0 => KeyCode::Numpad0,
+        winit::event::VirtualKeyCode::Numpad1 => KeyCode::Numpad1,
+        winit::event::VirtualKeyCode::Numpad2 => KeyCode::Numpad2,
+        winit::event::VirtualKeyCode::Numpad3 => KeyCode::Numpad3,
+        winit::event::VirtualKeyCode::Numpad4 => KeyCode::Numpad4,
+        winit::event::VirtualKeyCode::Numpad5 => KeyCode::Numpad5,
+        winit::event::VirtualKeyCode::Numpad6 => KeyCode::Numpad6,
+        winit::event::VirtualKeyCode::Numpad7 => KeyCode::Numpad7,
+        winit::event::VirtualKeyCode::Numpad8 => KeyCode::Numpad8,
+        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::Apostrophe => KeyCode::Apostrophe,
+        winit::event::VirtualKeyCode::Apps => KeyCode::Apps,
+        winit::event::VirtualKeyCode::At => KeyCode::At,
+        winit::event::VirtualKeyCode::Ax => KeyCode::Ax,
+        winit::event::VirtualKeyCode::Backslash => KeyCode::Backslash,
+        winit::event::VirtualKeyCode::Calculator => KeyCode::Calculator,
+        winit::event::VirtualKeyCode::Capital => KeyCode::Capital,
+        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::Equals => KeyCode::Equals,
+        winit::event::VirtualKeyCode::Grave => KeyCode::Grave,
+        winit::event::VirtualKeyCode::Kana => KeyCode::Kana,
+        winit::event::VirtualKeyCode::Kanji => KeyCode::Kanji,
+        winit::event::VirtualKeyCode::LAlt => KeyCode::LAlt,
+        winit::event::VirtualKeyCode::LBracket => KeyCode::LBracket,
+        winit::event::VirtualKeyCode::LControl => KeyCode::LControl,
+        winit::event::VirtualKeyCode::LShift => KeyCode::LShift,
+        winit::event::VirtualKeyCode::LWin => KeyCode::LWin,
+        winit::event::VirtualKeyCode::Mail => KeyCode::Mail,
+        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::Mute => KeyCode::Mute,
+        winit::event::VirtualKeyCode::MyComputer => KeyCode::MyComputer,
+        winit::event::VirtualKeyCode::NavigateForward => {
+            KeyCode::NavigateForward
+        }
+        winit::event::VirtualKeyCode::NavigateBackward => {
+            KeyCode::NavigateBackward
+        }
+        winit::event::VirtualKeyCode::NextTrack => KeyCode::NextTrack,
+        winit::event::VirtualKeyCode::NoConvert => KeyCode::NoConvert,
+        winit::event::VirtualKeyCode::NumpadComma => KeyCode::NumpadComma,
+        winit::event::VirtualKeyCode::NumpadEnter => KeyCode::NumpadEnter,
+        winit::event::VirtualKeyCode::NumpadEquals => KeyCode::NumpadEquals,
+        winit::event::VirtualKeyCode::OEM102 => KeyCode::OEM102,
+        winit::event::VirtualKeyCode::Period => KeyCode::Period,
+        winit::event::VirtualKeyCode::PlayPause => KeyCode::PlayPause,
+        winit::event::VirtualKeyCode::Power => KeyCode::Power,
+        winit::event::VirtualKeyCode::PrevTrack => KeyCode::PrevTrack,
+        winit::event::VirtualKeyCode::RAlt => KeyCode::RAlt,
+        winit::event::VirtualKeyCode::RBracket => KeyCode::RBracket,
+        winit::event::VirtualKeyCode::RControl => KeyCode::RControl,
+        winit::event::VirtualKeyCode::RShift => KeyCode::RShift,
+        winit::event::VirtualKeyCode::RWin => KeyCode::RWin,
+        winit::event::VirtualKeyCode::Semicolon => KeyCode::Semicolon,
+        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::Sysrq => KeyCode::Sysrq,
+        winit::event::VirtualKeyCode::Tab => KeyCode::Tab,
+        winit::event::VirtualKeyCode::Underline => KeyCode::Underline,
+        winit::event::VirtualKeyCode::Unlabeled => KeyCode::Unlabeled,
+        winit::event::VirtualKeyCode::VolumeDown => KeyCode::VolumeDown,
+        winit::event::VirtualKeyCode::VolumeUp => KeyCode::VolumeUp,
+        winit::event::VirtualKeyCode::Wake => KeyCode::Wake,
+        winit::event::VirtualKeyCode::WebBack => KeyCode::WebBack,
+        winit::event::VirtualKeyCode::WebFavorites => KeyCode::WebFavorites,
+        winit::event::VirtualKeyCode::WebForward => KeyCode::WebForward,
+        winit::event::VirtualKeyCode::WebHome => KeyCode::WebHome,
+        winit::event::VirtualKeyCode::WebRefresh => KeyCode::WebRefresh,
+        winit::event::VirtualKeyCode::WebSearch => KeyCode::WebSearch,
+        winit::event::VirtualKeyCode::WebStop => KeyCode::WebStop,
+        winit::event::VirtualKeyCode::Yen => KeyCode::Yen,
+        winit::event::VirtualKeyCode::Copy => KeyCode::Copy,
+        winit::event::VirtualKeyCode::Paste => KeyCode::Paste,
+        winit::event::VirtualKeyCode::Cut => KeyCode::Cut,
+    }
+}
diff --git a/winit/src/lib.rs b/winit/src/lib.rs
index 93e922d5..73745794 100644
--- a/winit/src/lib.rs
+++ b/winit/src/lib.rs
@@ -1,6 +1,8 @@
 pub use iced_native::*;
 pub use winit;
 
+pub mod conversion;
+
 pub use iced_native::renderer::Windowed;
 
 pub trait Application {