me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: Add window maximize support

Browse source
This commit is contained in:
Michael Aaron Murphy 2022-10-09 16:35:28 +02:00
parent 7ea7dbef57
commit 8a50836ffc
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
native/src/window/action.rs
View file

@ -18,6 +18,8 @@ pub enum Action<T> {
/// The new logical height of the window
height: u32,
},
/// Sets the window to maximized or back
Maximize(bool),
/// Move the window.
///
/// Unsupported on Wayland.
@ -29,6 +31,8 @@ pub enum Action<T> {
},
/// Set the [`Mode`] of the window.
SetMode(Mode),
/// Sets the window to maximized or back
ToggleMaximize,
/// Fetch the current [`Mode`] of the window.
FetchMode(Box<dyn FnOnce(Mode) -> T + 'static>),
}
@ -45,8 +49,10 @@ impl<T> Action<T> {
match self {
Self::Drag => Action::Drag,
Self::Resize { width, height } => Action::Resize { width, height },
Self::Maximize(bool) => Action::Maximize(bool),
Self::Move { x, y } => Action::Move { x, y },
Self::SetMode(mode) => Action::SetMode(mode),
Self::ToggleMaximize => Action::ToggleMaximize,
Self::FetchMode(o) => Action::FetchMode(Box::new(move |s| f(o(s)))),
}
}
@ -61,10 +67,12 @@ impl<T> fmt::Debug for Action<T> {
"Action::Resize {{ widget: {}, height: {} }}",
width, height
),
Self::Maximize(value) => write!(f, "Action::Maximize({})", value),
Self::Move { x, y } => {
write!(f, "Action::Move {{ x: {}, y: {} }}", x, y)
}
Self::SetMode(mode) => write!(f, "Action::SetMode({:?})", mode),
Self::ToggleMaximize => write!(f, "Action::ToggleMaximize"),
Self::FetchMode(_) => write!(f, "Action::FetchMode"),
}
}

6
winit/src/application.rs
View file

@ -624,6 +624,9 @@ pub fn run_command<A, E>(
height,
});
}
window::Action::Maximize(value) => {
window.set_maximized(value);
}
window::Action::Move { x, y } => {
window.set_outer_position(winit::dpi::LogicalPosition {
x,
@ -637,6 +640,9 @@ pub fn run_command<A, E>(
mode,
));
}
window::Action::ToggleMaximize => {
window.set_maximized(!window.is_maximized())
}
window::Action::FetchMode(tag) => {
let mode = if window.is_visible().unwrap_or(true) {
conversion::mode(window.fullscreen())

10
winit/src/window.rs
View file

@ -17,6 +17,11 @@ pub fn resize<Message>(width: u32, height: u32) -> Command<Message> {
}))
}
/// Sets the window to maximized or back.
pub fn maximize<Message>(value: bool) -> Command<Message> {
Command::single(command::Action::Window(window::Action::Maximize(value)))
}
/// Moves a window to the given logical coordinates.
pub fn move_to<Message>(x: i32, y: i32) -> Command<Message> {
Command::single(command::Action::Window(window::Action::Move { x, y }))
@ -27,6 +32,11 @@ pub fn set_mode<Message>(mode: Mode) -> Command<Message> {
Command::single(command::Action::Window(window::Action::SetMode(mode)))
}
/// Sets the window to maximized or back.
pub fn toggle_maximize<Message>() -> Command<Message> {
Command::single(command::Action::Window(window::Action::ToggleMaximize))
}
/// Fetches the current [`Mode`] of the window.
pub fn fetch_mode<Message>(
f: impl FnOnce(Mode) -> Message + 'static,