summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/keyboard.rs2
-rw-r--r--core/src/keyboard/event.rs31
-rw-r--r--core/src/lib.rs1
-rw-r--r--core/src/mouse.rs8
-rw-r--r--core/src/mouse/button.rs15
-rw-r--r--core/src/mouse/event.rs57
-rw-r--r--core/src/mouse/interaction.rs20
-rw-r--r--core/src/point.rs10
-rw-r--r--core/src/rectangle.rs65
-rw-r--r--core/src/size.rs5
-rw-r--r--core/src/vector.rs11
11 files changed, 221 insertions, 4 deletions
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/core/src/keyboard/event.rs b/core/src/keyboard/event.rs
new file mode 100644
index 00000000..bc8437a8
--- /dev/null
+++ b/core/src/keyboard/event.rs
@@ -0,0 +1,31 @@
+use super::{KeyCode, ModifiersState};
+
+/// A keyboard 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 {
+ /// A keyboard key was pressed.
+ KeyPressed {
+ /// The key identifier
+ key_code: KeyCode,
+
+ /// The state of the modifier keys
+ modifiers: ModifiersState,
+ },
+
+ /// A keyboard key was released.
+ KeyReleased {
+ /// The key identifier
+ key_code: KeyCode,
+
+ /// The state of the modifier keys
+ modifiers: ModifiersState,
+ },
+
+ /// A unicode character was received.
+ CharacterReceived(char),
+}
diff --git a/core/src/lib.rs b/core/src/lib.rs
index c2887a0b..6b9e612e 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -15,6 +15,7 @@
#![forbid(unsafe_code)]
#![forbid(rust_2018_idioms)]
pub mod keyboard;
+pub mod mouse;
mod align;
mod background;
diff --git a/core/src/mouse.rs b/core/src/mouse.rs
new file mode 100644
index 00000000..25ce6ac3
--- /dev/null
+++ b/core/src/mouse.rs
@@ -0,0 +1,8 @@
+//! Reuse basic mouse types.
+mod button;
+mod event;
+mod interaction;
+
+pub use button::Button;
+pub use event::{Event, ScrollDelta};
+pub use interaction::Interaction;
diff --git a/core/src/mouse/button.rs b/core/src/mouse/button.rs
new file mode 100644
index 00000000..aeb8a55d
--- /dev/null
+++ b/core/src/mouse/button.rs
@@ -0,0 +1,15 @@
+/// 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/core/src/mouse/event.rs b/core/src/mouse/event.rs
new file mode 100644
index 00000000..2f07b207
--- /dev/null
+++ b/core/src/mouse/event.rs
@@ -0,0 +1,57 @@
+use super::Button;
+
+/// 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.
+ ButtonPressed(Button),
+
+ /// A mouse button was released.
+ ButtonReleased(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,
+ },
+}
diff --git a/core/src/mouse/interaction.rs b/core/src/mouse/interaction.rs
new file mode 100644
index 00000000..664147a7
--- /dev/null
+++ b/core/src/mouse/interaction.rs
@@ -0,0 +1,20 @@
+/// The interaction of a mouse cursor.
+#[derive(Debug, Eq, PartialEq, Clone, Copy, PartialOrd, Ord)]
+#[allow(missing_docs)]
+pub enum Interaction {
+ Idle,
+ Pointer,
+ Grab,
+ Text,
+ Crosshair,
+ Working,
+ Grabbing,
+ ResizingHorizontally,
+ ResizingVertically,
+}
+
+impl Default for Interaction {
+ fn default() -> Interaction {
+ Interaction::Idle
+ }
+}
diff --git a/core/src/point.rs b/core/src/point.rs
index 2b5ad154..3714aa2f 100644
--- a/core/src/point.rs
+++ b/core/src/point.rs
@@ -1,7 +1,7 @@
use crate::Vector;
/// A 2D point.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
pub struct Point {
/// The X coordinate.
pub x: f32,
@@ -67,3 +67,11 @@ impl std::ops::Sub<Vector> for Point {
}
}
}
+
+impl std::ops::Sub<Point> for Point {
+ type Output = Vector;
+
+ fn sub(self, point: Point) -> Vector {
+ Vector::new(self.x - point.x, self.y - point.y)
+ }
+}
diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index aead6e9a..8bc89a44 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -1,4 +1,4 @@
-use crate::Point;
+use crate::{Point, Size, Vector};
/// A rectangle.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
@@ -17,6 +17,35 @@ pub struct Rectangle<T = f32> {
}
impl Rectangle<f32> {
+ /// Creates a new [`Rectangle`] with its top-left corner in the given
+ /// [`Point`] and with the provided [`Size`].
+ ///
+ /// [`Rectangle`]: struct.Rectangle.html
+ /// [`Point`]: struct.Point.html
+ /// [`Size`]: struct.Size.html
+ pub fn new(top_left: Point, size: Size) -> Self {
+ Self {
+ x: top_left.x,
+ y: top_left.y,
+ width: size.width,
+ height: size.height,
+ }
+ }
+
+ /// Creates a new [`Rectangle`] with its top-left corner at the origin
+ /// and with the provided [`Size`].
+ ///
+ /// [`Rectangle`]: struct.Rectangle.html
+ /// [`Size`]: struct.Size.html
+ pub fn with_size(size: Size) -> Self {
+ Self {
+ x: 0.0,
+ y: 0.0,
+ width: size.width,
+ height: size.height,
+ }
+ }
+
/// Returns the [`Point`] at the center of the [`Rectangle`].
///
/// [`Point`]: struct.Point.html
@@ -43,6 +72,21 @@ impl Rectangle<f32> {
self.y + self.height / 2.0
}
+ /// Returns the position of the top left corner of the [`Rectangle`].
+ ///
+ /// [`Rectangle`]: struct.Rectangle.html
+ pub fn position(&self) -> Point {
+ Point::new(self.x, self.y)
+ }
+
+ /// Returns the [`Size`] of the [`Rectangle`].
+ ///
+ /// [`Size`]: struct.Size.html
+ /// [`Rectangle`]: struct.Rectangle.html
+ pub fn size(&self) -> Size {
+ Size::new(self.width, self.height)
+ }
+
/// Returns true if the given [`Point`] is contained in the [`Rectangle`].
///
/// [`Point`]: struct.Point.html
@@ -112,8 +156,23 @@ impl From<Rectangle<f32>> for Rectangle<u32> {
Rectangle {
x: rectangle.x as u32,
y: rectangle.y as u32,
- width: rectangle.width.ceil() as u32,
- height: rectangle.height.ceil() as u32,
+ width: (rectangle.width + 0.5).round() as u32,
+ height: (rectangle.height + 0.5).round() as u32,
+ }
+ }
+}
+
+impl<T> std::ops::Add<Vector<T>> for Rectangle<T>
+where
+ T: std::ops::Add<Output = T>,
+{
+ type Output = Rectangle<T>;
+
+ fn add(self, translation: Vector<T>) -> Self {
+ Rectangle {
+ x: self.x + translation.x,
+ y: self.y + translation.y,
+ ..self
}
}
}
diff --git a/core/src/size.rs b/core/src/size.rs
index 4276f05f..a02299e8 100644
--- a/core/src/size.rs
+++ b/core/src/size.rs
@@ -15,6 +15,11 @@ impl Size {
/// [`Size`]: struct.Size.html
pub const ZERO: Size = Size::new(0., 0.);
+ /// A [`Size`] with a width and height of 1 unit.
+ ///
+ /// [`Size`]: struct.Size.html
+ pub const UNIT: Size = Size::new(1., 1.);
+
/// A [`Size`] with infinite width and height.
///
/// [`Size`]: struct.Size.html
diff --git a/core/src/vector.rs b/core/src/vector.rs
index a75053a0..def3f8c0 100644
--- a/core/src/vector.rs
+++ b/core/src/vector.rs
@@ -43,6 +43,17 @@ where
}
}
+impl<T> std::ops::Mul<T> for Vector<T>
+where
+ T: std::ops::Mul<Output = T> + Copy,
+{
+ type Output = Self;
+
+ fn mul(self, scale: T) -> Self {
+ Self::new(self.x * scale, self.y * scale)
+ }
+}
+
impl<T> Default for Vector<T>
where
T: Default,
generated by cgit (git 2.34.1) at 2025-04-09 17:26:52 +0000