From 11f5527d7645619f49b030e30485f24ac637efbd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 18 Aug 2022 14:39:15 +0200 Subject: Implement `SetMode` and `FetchMode` window actions --- native/src/command/action.rs | 4 ++-- native/src/window.rs | 2 ++ native/src/window/action.rs | 47 ++++++++++++++++++++++++++++++++++++++++++-- native/src/window/mode.rs | 12 +++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 native/src/window/mode.rs (limited to 'native') diff --git a/native/src/command/action.rs b/native/src/command/action.rs index 3fb02899..a6954f8f 100644 --- a/native/src/command/action.rs +++ b/native/src/command/action.rs @@ -20,7 +20,7 @@ pub enum Action { Clipboard(clipboard::Action), /// Run a window action. - Window(window::Action), + Window(window::Action), /// Run a system action. System(system::Action), @@ -46,7 +46,7 @@ impl Action { match self { Self::Future(future) => Action::Future(Box::pin(future.map(f))), Self::Clipboard(action) => Action::Clipboard(action.map(f)), - Self::Window(window) => Action::Window(window), + Self::Window(window) => Action::Window(window.map(f)), Self::System(system) => Action::System(system.map(f)), Self::Widget(widget) => Action::Widget(widget.map(f)), } diff --git a/native/src/window.rs b/native/src/window.rs index 62487fb9..f910b8f2 100644 --- a/native/src/window.rs +++ b/native/src/window.rs @@ -1,6 +1,8 @@ //! Build window-based GUI applications. mod action; mod event; +mod mode; pub use action::Action; pub use event::Event; +pub use mode::Mode; diff --git a/native/src/window/action.rs b/native/src/window/action.rs index 01294e83..d891c6ac 100644 --- a/native/src/window/action.rs +++ b/native/src/window/action.rs @@ -1,6 +1,10 @@ +use crate::window::Mode; + +use iced_futures::MaybeSend; +use std::fmt; + /// An operation to be performed on some window. -#[derive(Debug)] -pub enum Action { +pub enum Action { /// Resize the window. Resize { /// The new logical width of the window @@ -15,4 +19,43 @@ pub enum Action { /// The new logical y location of the window y: i32, }, + /// Set the [`Mode`] of the window. + SetMode(Mode), + /// Fetch the current [`Mode`] of the window. + FetchMode(Box T + 'static>), +} + +impl Action { + /// Maps the output of a window [`Action`] using the provided closure. + pub fn map( + self, + f: impl Fn(T) -> A + 'static + MaybeSend + Sync, + ) -> Action + where + T: 'static, + { + match self { + Self::Resize { width, height } => Action::Resize { width, height }, + Self::Move { x, y } => Action::Move { x, y }, + Self::SetMode(mode) => Action::SetMode(mode), + Self::FetchMode(o) => Action::FetchMode(Box::new(move |s| f(o(s)))), + } + } +} + +impl fmt::Debug for Action { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::Resize { width, height } => write!( + f, + "Action::Resize {{ widget: {}, height: {} }}", + width, height + ), + Self::Move { x, y } => { + write!(f, "Action::Move {{ x: {}, y: {} }}", x, y) + } + Self::SetMode(mode) => write!(f, "Action::SetMode({:?})", mode), + Self::FetchMode(_) => write!(f, "Action::FetchMode"), + } + } } diff --git a/native/src/window/mode.rs b/native/src/window/mode.rs new file mode 100644 index 00000000..fdce8e23 --- /dev/null +++ b/native/src/window/mode.rs @@ -0,0 +1,12 @@ +/// 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, +} -- cgit