From 65cac922b3ff6cf289319b9c12aab68aabea844a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 6 Dec 2019 04:01:48 +0100
Subject: Add `ModifiersState` to `keyboard::Event::Input`

---
 native/src/input/keyboard.rs                 |  2 ++
 native/src/input/keyboard/event.rs           |  7 +++++--
 native/src/input/keyboard/modifiers_state.rs | 15 +++++++++++++++
 native/src/widget/text_input.rs              |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 native/src/input/keyboard/modifiers_state.rs

(limited to 'native/src')

diff --git a/native/src/input/keyboard.rs b/native/src/input/keyboard.rs
index 57c24484..432e75ba 100644
--- a/native/src/input/keyboard.rs
+++ b/native/src/input/keyboard.rs
@@ -1,6 +1,8 @@
 //! Build keyboard events.
 mod event;
 mod key_code;
+mod modifiers_state;
 
 pub use event::Event;
 pub use key_code::KeyCode;
+pub use modifiers_state::ModifiersState;
diff --git a/native/src/input/keyboard/event.rs b/native/src/input/keyboard/event.rs
index 8118f112..862f30c4 100644
--- a/native/src/input/keyboard/event.rs
+++ b/native/src/input/keyboard/event.rs
@@ -1,13 +1,13 @@
-use super::KeyCode;
+use super::{KeyCode, ModifiersState};
 use crate::input::ButtonState;
 
-#[derive(Debug, Clone, Copy, PartialEq)]
 /// A keyboard event.
 ///
 /// _**Note:** This type is largely incomplete! If you need to track
 /// additional events, feel free to [open an issue] and share your use case!_
 ///
 /// [open an issue]: https://github.com/hecrj/iced/issues
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Event {
     /// A keyboard key was pressed or released.
     Input {
@@ -16,6 +16,9 @@ pub enum Event {
 
         /// The key identifier
         key_code: KeyCode,
+
+        /// The state of the modifier keys
+        modifiers: ModifiersState,
     },
 
     /// A unicode character was received.
diff --git a/native/src/input/keyboard/modifiers_state.rs b/native/src/input/keyboard/modifiers_state.rs
new file mode 100644
index 00000000..4e3794b3
--- /dev/null
+++ b/native/src/input/keyboard/modifiers_state.rs
@@ -0,0 +1,15 @@
+/// The current state of the keyboard modifiers.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub struct ModifiersState {
+    /// Whether a shift key is pressed
+    pub shift: bool,
+
+    /// Whether a control key is pressed
+    pub control: bool,
+
+    /// Whether an alt key is pressed
+    pub alt: bool,
+
+    /// Whether a logo key is pressed (e.g. windows key, command key...)
+    pub logo: bool,
+}
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index dae772bc..cfa8b0f4 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -202,6 +202,7 @@ where
             Event::Keyboard(keyboard::Event::Input {
                 key_code,
                 state: ButtonState::Pressed,
+                modifiers,
             }) if self.state.is_focused => match key_code {
                 keyboard::KeyCode::Enter => {
                     if let Some(on_submit) = self.on_submit.clone() {
-- 
cgit