diff options
Diffstat (limited to 'native/src/input')
| -rw-r--r-- | native/src/input/button_state.rs | 9 | ||||
| -rw-r--r-- | native/src/input/keyboard.rs | 2 | ||||
| -rw-r--r-- | native/src/input/mouse.rs | 5 | ||||
| -rw-r--r-- | native/src/input/mouse/button.rs | 15 | ||||
| -rw-r--r-- | native/src/input/mouse/event.rs | 61 | 
5 files changed, 2 insertions, 90 deletions
diff --git a/native/src/input/button_state.rs b/native/src/input/button_state.rs deleted file mode 100644 index 988043ba..00000000 --- a/native/src/input/button_state.rs +++ /dev/null @@ -1,9 +0,0 @@ -/// The state of a button. -#[derive(Debug, Hash, Ord, PartialOrd, PartialEq, Eq, Clone, Copy)] -pub enum ButtonState { -    /// The button is pressed. -    Pressed, - -    /// The button is __not__ pressed. -    Released, -} 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::*; diff --git a/native/src/input/mouse/button.rs b/native/src/input/mouse/button.rs deleted file mode 100644 index aeb8a55d..00000000 --- a/native/src/input/mouse/button.rs +++ /dev/null @@ -1,15 +0,0 @@ -/// The button of a mouse. -#[derive(Debug, Hash, PartialEq, Eq, Clone, Copy)] -pub enum Button { -    /// The left mouse button. -    Left, - -    /// The right mouse button. -    Right, - -    /// The middle (wheel) button. -    Middle, - -    /// Some other button. -    Other(u8), -} diff --git a/native/src/input/mouse/event.rs b/native/src/input/mouse/event.rs deleted file mode 100644 index aafc4fe3..00000000 --- a/native/src/input/mouse/event.rs +++ /dev/null @@ -1,61 +0,0 @@ -use super::Button; -use crate::input::ButtonState; - -/// A mouse event. -/// -/// _**Note:** This type is largely incomplete! If you need to track -/// additional events, feel free to [open an issue] and share your use case!_ -/// -/// [open an issue]: https://github.com/hecrj/iced/issues -#[derive(Debug, Clone, Copy, PartialEq)] -pub enum Event { -    /// The mouse cursor entered the window. -    CursorEntered, - -    /// The mouse cursor left the window. -    CursorLeft, - -    /// The mouse cursor was moved -    CursorMoved { -        /// The X coordinate of the mouse position -        x: f32, - -        /// The Y coordinate of the mouse position -        y: f32, -    }, - -    /// A mouse button was pressed or released. -    Input { -        /// The state of the button -        state: ButtonState, - -        /// The button identifier -        button: Button, -    }, - -    /// The mouse wheel was scrolled. -    WheelScrolled { -        /// The scroll movement. -        delta: ScrollDelta, -    }, -} - -/// A scroll movement. -#[derive(Debug, Clone, Copy, PartialEq)] -pub enum ScrollDelta { -    /// A line-based scroll movement -    Lines { -        /// The number of horizontal lines scrolled -        x: f32, - -        /// The number of vertical lines scrolled -        y: f32, -    }, -    /// A pixel-based scroll movement -    Pixels { -        /// The number of horizontal pixels scrolled -        x: f32, -        /// The number of vertical pixels scrolled -        y: f32, -    }, -}  | 
