diff options
author | 2023-02-17 11:45:34 -0800 | |
---|---|---|
committer | 2023-02-17 11:45:34 -0800 | |
commit | 744cef5608a91fe55cbbe1adb73a9a0b5e266668 (patch) | |
tree | f88ca6ae3c481e2de74178bb3f0d1f1b685e1740 /winit/src/application.rs | |
parent | 8da098330b58542cc929f4f24d02e26bd654bae4 (diff) | |
parent | 7dc1fb488ddbd12519571b51d75ae0c28875911d (diff) | |
download | iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.gz iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.tar.bz2 iced-744cef5608a91fe55cbbe1adb73a9a0b5e266668.zip |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# winit/src/window.rs
Diffstat (limited to 'winit/src/application.rs')
-rw-r--r-- | winit/src/application.rs | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/winit/src/application.rs b/winit/src/application.rs index 692c2f74..3123a318 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -752,11 +752,11 @@ pub fn run_command<A, E>( height, }); } - window::Action::Maximize(value) => { - window.set_maximized(value); + window::Action::Maximize(maximized) => { + window.set_maximized(maximized); } - window::Action::Minimize(value) => { - window.set_minimized(value); + window::Action::Minimize(minimized) => { + window.set_minimized(minimized); } window::Action::Move { x, y } => { window.set_outer_position(winit::dpi::LogicalPosition { @@ -786,13 +786,24 @@ pub fn run_command<A, E>( window.set_maximized(!window.is_maximized()) } window::Action::ToggleDecorations => { - window.set_decorations(!window.is_decorated()) + window.set_decorations(!window.is_decorated()); } - window::Action::RequestUserAttention(user_attention) => window - .request_user_attention( + window::Action::RequestUserAttention(user_attention) => { + window.request_user_attention( user_attention.map(conversion::user_attention), - ), - window::Action::GainFocus => window.focus_window(), + ); + } + window::Action::GainFocus => { + window.focus_window(); + } + window::Action::ChangeAlwaysOnTop(on_top) => { + window.set_always_on_top(on_top); + } + window::Action::FetchId(tag) => { + proxy + .send_event(tag(window.id().into())) + .expect("Send message to event loop"); + } }, command::Action::System(action) => match action { system::Action::QueryInformation(_tag) => { |