From 137664ca88a9bf2398380fd1c04b00c62c868383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Thu, 30 Apr 2020 04:59:07 +0200 Subject: [PATCH] Move `keyboard::Event` to `iced_core` --- core/src/keyboard.rs | 2 ++ {native/src/input => core/src}/keyboard/event.rs | 0 native/src/input/keyboard.rs | 5 +---- native/src/input/mouse.rs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) rename {native/src/input => core/src}/keyboard/event.rs (100%) diff --git a/core/src/keyboard.rs b/core/src/keyboard.rs index d98b2989..b26bdb3d 100644 --- a/core/src/keyboard.rs +++ b/core/src/keyboard.rs @@ -1,6 +1,8 @@ //! Reuse basic keyboard types. +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/core/src/keyboard/event.rs similarity index 100% rename from native/src/input/keyboard/event.rs rename to core/src/keyboard/event.rs diff --git a/native/src/input/keyboard.rs b/native/src/input/keyboard.rs index 220b7f17..012538e3 100644 --- a/native/src/input/keyboard.rs +++ b/native/src/input/keyboard.rs @@ -1,5 +1,2 @@ -//! Build keyboard events. -mod event; - -pub use event::Event; +//! Track keyboard events. pub use iced_core::keyboard::*; diff --git a/native/src/input/mouse.rs b/native/src/input/mouse.rs index ae3f1596..9ee406cf 100644 --- a/native/src/input/mouse.rs +++ b/native/src/input/mouse.rs @@ -1,4 +1,4 @@ -//! Build mouse events. +//! Track mouse events. pub mod click;