diff options
Diffstat (limited to '')
-rw-r--r-- | core/src/button_state.rs (renamed from native/src/input/button_state.rs) | 0 | ||||
-rw-r--r-- | core/src/mouse/button.rs (renamed from native/src/input/mouse/button.rs) | 0 | ||||
-rw-r--r-- | core/src/mouse/event.rs (renamed from native/src/input/mouse/event.rs) | 8 | ||||
-rw-r--r-- | native/src/input.rs | 4 | ||||
-rw-r--r-- | native/src/input/keyboard.rs | 2 | ||||
-rw-r--r-- | native/src/input/mouse.rs | 5 |
6 files changed, 7 insertions, 12 deletions
diff --git a/native/src/input/button_state.rs b/core/src/button_state.rs index 988043ba..988043ba 100644 --- a/native/src/input/button_state.rs +++ b/core/src/button_state.rs diff --git a/native/src/input/mouse/button.rs b/core/src/mouse/button.rs index aeb8a55d..aeb8a55d 100644 --- a/native/src/input/mouse/button.rs +++ b/core/src/mouse/button.rs diff --git a/native/src/input/mouse/event.rs b/core/src/mouse/event.rs index aafc4fe3..52e9d851 100644 --- a/native/src/input/mouse/event.rs +++ b/core/src/mouse/event.rs @@ -1,5 +1,5 @@ use super::Button; -use crate::input::ButtonState; +use crate::ButtonState; /// A mouse event. /// @@ -26,11 +26,11 @@ pub enum Event { /// A mouse button was pressed or released. Input { - /// The state of the button - state: ButtonState, - /// The button identifier button: Button, + + /// The state of the button + state: ButtonState, }, /// The mouse wheel was scrolled. diff --git a/native/src/input.rs b/native/src/input.rs index 097fa730..7f5114c3 100644 --- a/native/src/input.rs +++ b/native/src/input.rs @@ -2,6 +2,4 @@ pub mod keyboard; pub mod mouse; -mod button_state; - -pub use button_state::ButtonState; +pub use iced_core::ButtonState; diff --git a/native/src/input/keyboard.rs b/native/src/input/keyboard.rs index 928bf492..220b7f17 100644 --- a/native/src/input/keyboard.rs +++ b/native/src/input/keyboard.rs @@ -2,4 +2,4 @@ mod event; pub use event::Event; -pub use iced_core::keyboard::{KeyCode, ModifiersState}; +pub use iced_core::keyboard::*; diff --git a/native/src/input/mouse.rs b/native/src/input/mouse.rs index 7198b233..ae3f1596 100644 --- a/native/src/input/mouse.rs +++ b/native/src/input/mouse.rs @@ -1,9 +1,6 @@ //! Build mouse events. -mod button; -mod event; pub mod click; -pub use button::Button; pub use click::Click; -pub use event::{Event, ScrollDelta}; +pub use iced_core::mouse::*; |