From e139aae1439d362ada017a05c9554eaae0883888 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 30 Apr 2020 04:34:29 +0200
Subject: Split `Input` keyboard event by `ButtonState`

---
 native/src/widget/text_input.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'native/src/widget/text_input.rs')

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index 7d1a7415..ea6921b5 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -327,9 +327,8 @@ where
                 let message = (self.on_change)(editor.contents());
                 messages.push(message);
             }
-            Event::Keyboard(keyboard::Event::Input {
+            Event::Keyboard(keyboard::Event::KeyPressed {
                 key_code,
-                state: ButtonState::Pressed,
                 modifiers,
             }) if self.state.is_focused => match key_code {
                 keyboard::KeyCode::Enter => {
@@ -473,10 +472,8 @@ where
                 }
                 _ => {}
             },
-            Event::Keyboard(keyboard::Event::Input {
-                key_code,
-                state: ButtonState::Released,
-                ..
+            Event::Keyboard(keyboard::Event::KeyReleased {
+                key_code, ..
             }) => match key_code {
                 keyboard::KeyCode::V => {
                     self.state.is_pasting = None;
-- 
cgit 


From e55cd9652e7c7aea4dc2c6ccb83769246d1a808e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 30 Apr 2020 04:53:15 +0200
Subject: Split `Input` mouse event by `ButtonState`

---
 native/src/widget/text_input.rs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'native/src/widget/text_input.rs')

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index ea6921b5..b11269db 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -18,7 +18,6 @@ use crate::{
     input::{
         keyboard,
         mouse::{self, click},
-        ButtonState,
     },
     layout, Clipboard, Element, Event, Font, Hasher, Layout, Length, Point,
     Rectangle, Size, Widget,
@@ -212,10 +211,7 @@ where
         clipboard: Option<&dyn Clipboard>,
     ) {
         match event {
-            Event::Mouse(mouse::Event::Input {
-                button: mouse::Button::Left,
-                state: ButtonState::Pressed,
-            }) => {
+            Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
                 let is_clicked = layout.bounds().contains(cursor_position);
 
                 if is_clicked {
@@ -280,10 +276,7 @@ where
                 self.state.is_dragging = is_clicked;
                 self.state.is_focused = is_clicked;
             }
-            Event::Mouse(mouse::Event::Input {
-                button: mouse::Button::Left,
-                state: ButtonState::Released,
-            }) => {
+            Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left)) => {
                 self.state.is_dragging = false;
             }
             Event::Mouse(mouse::Event::CursorMoved { x, .. }) => {
-- 
cgit 


From bb9ccc4f62ceea08dc1ef0c6c4d3d219897e44a1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 30 Apr 2020 05:04:45 +0200
Subject: Remove inconsistent `input` module in `iced_native`

---
 native/src/widget/text_input.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'native/src/widget/text_input.rs')

diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs
index b11269db..1cdbe007 100644
--- a/native/src/widget/text_input.rs
+++ b/native/src/widget/text_input.rs
@@ -15,12 +15,10 @@ pub use value::Value;
 use editor::Editor;
 
 use crate::{
-    input::{
-        keyboard,
-        mouse::{self, click},
-    },
-    layout, Clipboard, Element, Event, Font, Hasher, Layout, Length, Point,
-    Rectangle, Size, Widget,
+    keyboard, layout,
+    mouse::{self, click},
+    Clipboard, Element, Event, Font, Hasher, Layout, Length, Point, Rectangle,
+    Size, Widget,
 };
 
 use std::u32;
@@ -739,7 +737,7 @@ fn find_cursor_position<Renderer: self::Renderer>(
 }
 
 mod platform {
-    use crate::input::keyboard;
+    use crate::keyboard;
 
     pub fn is_jump_modifier_pressed(
         modifiers: keyboard::ModifiersState,
-- 
cgit