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

Add FetchSize command - apply the changes discussed at #water-cooler

Browse source
This commit is contained in:
Yiğit Özdemir 2023-06-22 18:28:32 +03:00
parent 21a71b753d
commit b394c84b37
No known key found for this signature in database
GPG key ID: 7FDC39C00954F1C7
4 changed files with 7 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

18
runtime/src/window/action.rs
View file

@ -1,7 +1,3 @@
use iced_core::window::SizeType;
use crate::core::window::{Icon, Level, Mode, UserAttention};
use crate::futures::MaybeSend;
@ -25,12 +21,7 @@ pub enum Action<T> {
height: u32,
},
/// Fetch the current size of the window.
FetchSize {
/// Which size to fetch
size_type: SizeType,
/// Callback function
callback: Box<dyn FnOnce((u32, u32)) -> T + 'static>,
},
FetchSize(Box<dyn FnOnce((u32, u32)) -> T + 'static>),
/// Set the window to maximized or back
Maximize(bool),
/// Set the window to minimized or back
@ -115,10 +106,7 @@ impl<T> Action<T> {
Self::Close => Action::Close,
Self::Drag => Action::Drag,
Self::Resize { width, height } => Action::Resize { width, height },
Self::FetchSize { size_type, callback } => Action::FetchSize {
size_type: size_type,
callback: Box::new(move |s| f(callback(s))),
},
Self::FetchSize(o) => Action::FetchSize(Box::new(move |s| f(o(s)))),
Self::Maximize(maximized) => Action::Maximize(maximized),
Self::Minimize(minimized) => Action::Minimize(minimized),
Self::Move { x, y } => Action::Move { x, y },
@ -146,7 +134,7 @@ impl<T> fmt::Debug for Action<T> {
f,
"Action::Resize {{ widget: {width}, height: {height} }}"
),
Self::FetchSize { size_type, .. } => write!(f, "Action::FetchSize {{ size_type: {size_type:?} }}"),
Self::FetchSize(_) => write!(f, "Action::FetchSize"),
Self::Maximize(maximized) => {
write!(f, "Action::Maximize({maximized})")
}