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/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 | 
5 files changed, 13 insertions, 4 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. | 
