diff options
| -rw-r--r-- | core/src/button_state.rs (renamed from native/src/input/button_state.rs) | 0 | ||||
| -rw-r--r-- | core/src/lib.rs | 3 | ||||
| -rw-r--r-- | core/src/mouse.rs | 6 | ||||
| -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 | ||||
| -rw-r--r-- | src/lib.rs | 4 | ||||
| -rw-r--r-- | src/mouse.rs | 3 |
10 files changed, 23 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/core/src/lib.rs b/core/src/lib.rs index c2887a0b..606c1b8b 100644 --- a/core/src/lib.rs +++ b/core/src/lib.rs @@ -15,9 +15,11 @@ #![forbid(unsafe_code)] #![forbid(rust_2018_idioms)] pub mod keyboard; +pub mod mouse; mod align; mod background; +mod button_state; mod color; mod font; mod length; @@ -28,6 +30,7 @@ mod vector; pub use align::{Align, HorizontalAlignment, VerticalAlignment}; pub use background::Background; +pub use button_state::ButtonState; pub use color::Color; pub use font::Font; pub use length::Length; diff --git a/core/src/mouse.rs b/core/src/mouse.rs new file mode 100644 index 00000000..101e04d5 --- /dev/null +++ b/core/src/mouse.rs @@ -0,0 +1,6 @@ +//! Reuse basic mouse types. +mod button; +mod event; + +pub use button::Button; +pub use event::{Event, ScrollDelta}; 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::*; @@ -185,6 +185,7 @@ mod sandbox; pub mod executor; pub mod keyboard; +pub mod mouse; pub mod settings; pub mod widget; pub mod window; @@ -208,3 +209,6 @@ pub use runtime::{ futures, Align, Background, Color, Command, Font, HorizontalAlignment, Length, Point, Size, Subscription, Vector, VerticalAlignment, }; + +#[cfg(not(target_arch = "wasm32"))] +pub use runtime::input::ButtonState; diff --git a/src/mouse.rs b/src/mouse.rs new file mode 100644 index 00000000..8be36d37 --- /dev/null +++ b/src/mouse.rs @@ -0,0 +1,3 @@ +//! Listen and react to mouse events. +#[cfg(not(target_arch = "wasm32"))] +pub use iced_winit::input::mouse::{Button, Event, ScrollDelta}; |