feat: Add window maximize support
This commit is contained in:
parent
7ea7dbef57
commit
8a50836ffc
3 changed files with 24 additions and 0 deletions
|
|
@ -18,6 +18,8 @@ pub enum Action<T> {
|
||||||
/// The new logical height of the window
|
/// The new logical height of the window
|
||||||
height: u32,
|
height: u32,
|
||||||
},
|
},
|
||||||
|
/// Sets the window to maximized or back
|
||||||
|
Maximize(bool),
|
||||||
/// Move the window.
|
/// Move the window.
|
||||||
///
|
///
|
||||||
/// Unsupported on Wayland.
|
/// Unsupported on Wayland.
|
||||||
|
|
@ -29,6 +31,8 @@ pub enum Action<T> {
|
||||||
},
|
},
|
||||||
/// Set the [`Mode`] of the window.
|
/// Set the [`Mode`] of the window.
|
||||||
SetMode(Mode),
|
SetMode(Mode),
|
||||||
|
/// Sets the window to maximized or back
|
||||||
|
ToggleMaximize,
|
||||||
/// Fetch the current [`Mode`] of the window.
|
/// Fetch the current [`Mode`] of the window.
|
||||||
FetchMode(Box<dyn FnOnce(Mode) -> T + 'static>),
|
FetchMode(Box<dyn FnOnce(Mode) -> T + 'static>),
|
||||||
}
|
}
|
||||||
|
|
@ -45,8 +49,10 @@ impl<T> Action<T> {
|
||||||
match self {
|
match self {
|
||||||
Self::Drag => Action::Drag,
|
Self::Drag => Action::Drag,
|
||||||
Self::Resize { width, height } => Action::Resize { width, height },
|
Self::Resize { width, height } => Action::Resize { width, height },
|
||||||
|
Self::Maximize(bool) => Action::Maximize(bool),
|
||||||
Self::Move { x, y } => Action::Move { x, y },
|
Self::Move { x, y } => Action::Move { x, y },
|
||||||
Self::SetMode(mode) => Action::SetMode(mode),
|
Self::SetMode(mode) => Action::SetMode(mode),
|
||||||
|
Self::ToggleMaximize => Action::ToggleMaximize,
|
||||||
Self::FetchMode(o) => Action::FetchMode(Box::new(move |s| f(o(s)))),
|
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: {} }}",
|
"Action::Resize {{ widget: {}, height: {} }}",
|
||||||
width, height
|
width, height
|
||||||
),
|
),
|
||||||
|
Self::Maximize(value) => write!(f, "Action::Maximize({})", value),
|
||||||
Self::Move { x, y } => {
|
Self::Move { x, y } => {
|
||||||
write!(f, "Action::Move {{ x: {}, y: {} }}", x, y)
|
write!(f, "Action::Move {{ x: {}, y: {} }}", x, y)
|
||||||
}
|
}
|
||||||
Self::SetMode(mode) => write!(f, "Action::SetMode({:?})", mode),
|
Self::SetMode(mode) => write!(f, "Action::SetMode({:?})", mode),
|
||||||
|
Self::ToggleMaximize => write!(f, "Action::ToggleMaximize"),
|
||||||
Self::FetchMode(_) => write!(f, "Action::FetchMode"),
|
Self::FetchMode(_) => write!(f, "Action::FetchMode"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -624,6 +624,9 @@ pub fn run_command<A, E>(
|
||||||
height,
|
height,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
window::Action::Maximize(value) => {
|
||||||
|
window.set_maximized(value);
|
||||||
|
}
|
||||||
window::Action::Move { x, y } => {
|
window::Action::Move { x, y } => {
|
||||||
window.set_outer_position(winit::dpi::LogicalPosition {
|
window.set_outer_position(winit::dpi::LogicalPosition {
|
||||||
x,
|
x,
|
||||||
|
|
@ -637,6 +640,9 @@ pub fn run_command<A, E>(
|
||||||
mode,
|
mode,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
window::Action::ToggleMaximize => {
|
||||||
|
window.set_maximized(!window.is_maximized())
|
||||||
|
}
|
||||||
window::Action::FetchMode(tag) => {
|
window::Action::FetchMode(tag) => {
|
||||||
let mode = if window.is_visible().unwrap_or(true) {
|
let mode = if window.is_visible().unwrap_or(true) {
|
||||||
conversion::mode(window.fullscreen())
|
conversion::mode(window.fullscreen())
|
||||||
|
|
|
||||||
|
|
@ -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.
|
/// Moves a window to the given logical coordinates.
|
||||||
pub fn move_to<Message>(x: i32, y: i32) -> Command<Message> {
|
pub fn move_to<Message>(x: i32, y: i32) -> Command<Message> {
|
||||||
Command::single(command::Action::Window(window::Action::Move { x, y }))
|
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)))
|
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.
|
/// Fetches the current [`Mode`] of the window.
|
||||||
pub fn fetch_mode<Message>(
|
pub fn fetch_mode<Message>(
|
||||||
f: impl FnOnce(Mode) -> Message + 'static,
|
f: impl FnOnce(Mode) -> Message + 'static,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue