summaryrefslogtreecommitdiffstats
path: root/native/src/window
diff options
context:
space:
mode:
Diffstat (limited to 'native/src/window')
-rw-r--r--native/src/window/action.rs4
-rw-r--r--native/src/window/event.rs58
-rw-r--r--native/src/window/mode.rs12
-rw-r--r--native/src/window/redraw_request.rs38
-rw-r--r--native/src/window/user_attention.rs21
5 files changed, 2 insertions, 131 deletions
diff --git a/native/src/window/action.rs b/native/src/window/action.rs
index ce36d129..c1dbd84f 100644
--- a/native/src/window/action.rs
+++ b/native/src/window/action.rs
@@ -1,6 +1,6 @@
-use crate::window::{Mode, UserAttention};
+use crate::core::window::{Mode, UserAttention};
+use crate::futures::MaybeSend;
-use iced_futures::MaybeSend;
use std::fmt;
/// An operation to be performed on some window.
diff --git a/native/src/window/event.rs b/native/src/window/event.rs
deleted file mode 100644
index e2fb5e66..00000000
--- a/native/src/window/event.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use crate::time::Instant;
-
-use std::path::PathBuf;
-
-/// A window-related event.
-#[derive(PartialEq, Eq, Clone, Debug)]
-pub enum Event {
- /// A window was moved.
- Moved {
- /// The new logical x location of the window
- x: i32,
- /// The new logical y location of the window
- y: i32,
- },
-
- /// A window was resized.
- Resized {
- /// The new logical width of the window
- width: u32,
- /// The new logical height of the window
- height: u32,
- },
-
- /// A window redraw was requested.
- ///
- /// The [`Instant`] contains the current time.
- RedrawRequested(Instant),
-
- /// The user has requested for the window to close.
- ///
- /// Usually, you will want to terminate the execution whenever this event
- /// occurs.
- CloseRequested,
-
- /// A window was focused.
- Focused,
-
- /// A window was unfocused.
- Unfocused,
-
- /// A file is being hovered over the window.
- ///
- /// When the user hovers multiple files at once, this event will be emitted
- /// for each file separately.
- FileHovered(PathBuf),
-
- /// A file has beend dropped into the window.
- ///
- /// When the user drops multiple files at once, this event will be emitted
- /// for each file separately.
- FileDropped(PathBuf),
-
- /// A file was hovered, but has exited the window.
- ///
- /// There will be a single `FilesHoveredLeft` event triggered even if
- /// multiple files were hovered.
- FilesHoveredLeft,
-}
diff --git a/native/src/window/mode.rs b/native/src/window/mode.rs
deleted file mode 100644
index fdce8e23..00000000
--- a/native/src/window/mode.rs
+++ /dev/null
@@ -1,12 +0,0 @@
-/// The mode of a window-based application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum Mode {
- /// The application appears in its own window.
- Windowed,
-
- /// The application takes the whole screen of its current monitor.
- Fullscreen,
-
- /// The application is hidden
- Hidden,
-}
diff --git a/native/src/window/redraw_request.rs b/native/src/window/redraw_request.rs
deleted file mode 100644
index 3b4f0fd3..00000000
--- a/native/src/window/redraw_request.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-use crate::time::Instant;
-
-/// A request to redraw a window.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
-pub enum RedrawRequest {
- /// Redraw the next frame.
- NextFrame,
-
- /// Redraw at the given time.
- At(Instant),
-}
-
-#[cfg(test)]
-mod tests {
- use super::*;
- use std::time::{Duration, Instant};
-
- #[test]
- fn ordering() {
- let now = Instant::now();
- let later = now + Duration::from_millis(10);
-
- assert_eq!(RedrawRequest::NextFrame, RedrawRequest::NextFrame);
- assert_eq!(RedrawRequest::At(now), RedrawRequest::At(now));
-
- assert!(RedrawRequest::NextFrame < RedrawRequest::At(now));
- assert!(RedrawRequest::At(now) > RedrawRequest::NextFrame);
- assert!(RedrawRequest::At(now) < RedrawRequest::At(later));
- assert!(RedrawRequest::At(later) > RedrawRequest::At(now));
-
- assert!(RedrawRequest::NextFrame <= RedrawRequest::NextFrame);
- assert!(RedrawRequest::NextFrame <= RedrawRequest::At(now));
- assert!(RedrawRequest::At(now) >= RedrawRequest::NextFrame);
- assert!(RedrawRequest::At(now) <= RedrawRequest::At(now));
- assert!(RedrawRequest::At(now) <= RedrawRequest::At(later));
- assert!(RedrawRequest::At(later) >= RedrawRequest::At(now));
- }
-}
diff --git a/native/src/window/user_attention.rs b/native/src/window/user_attention.rs
deleted file mode 100644
index b03dfeef..00000000
--- a/native/src/window/user_attention.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-/// The type of user attention to request.
-///
-/// ## Platform-specific
-///
-/// - **X11:** Sets the WM's `XUrgencyHint`. No distinction between [`Critical`] and [`Informational`].
-///
-/// [`Critical`]: Self::Critical
-/// [`Informational`]: Self::Informational
-#[derive(Debug, Clone, Copy)]
-pub enum UserAttention {
- /// ## Platform-specific
- ///
- /// - **macOS:** Bounces the dock icon until the application is in focus.
- /// - **Windows:** Flashes both the window and the taskbar button until the application is in focus.
- Critical,
- /// ## Platform-specific
- ///
- /// - **macOS:** Bounces the dock icon once.
- /// - **Windows:** Flashes the taskbar button until the application is in focus.
- Informational,
-}