diff options
author | 2023-01-02 10:58:07 -0800 | |
---|---|---|
committer | 2023-01-09 11:28:07 -0800 | |
commit | 942f1c91afb8257e289af8d0c229f74819f68361 (patch) | |
tree | 7f24e3d71716c2661aae009216224303f3d183be /winit | |
parent | 5e4e410b18eb744cf70ae1f18b9ef08611f59150 (diff) | |
download | iced-942f1c91afb8257e289af8d0c229f74819f68361.tar.gz iced-942f1c91afb8257e289af8d0c229f74819f68361.tar.bz2 iced-942f1c91afb8257e289af8d0c229f74819f68361.zip |
merged in iced master
Diffstat (limited to 'winit')
-rw-r--r-- | winit/src/multi_window.rs | 20 | ||||
-rw-r--r-- | winit/src/multi_window/state.rs | 4 |
2 files changed, 22 insertions, 2 deletions
diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs index c0c233c5..0a2f71ad 100644 --- a/winit/src/multi_window.rs +++ b/winit/src/multi_window.rs @@ -863,6 +863,10 @@ pub fn run_command<A, E>( .send_event(Event::CloseWindow(id)) .expect("Send message to event loop"); } + window::Action::Drag => { + let window = windows.get(&id).expect("No window found"); + let _res = window.drag_window(); + } window::Action::Resize { width, height } => { let window = windows.get(&id).expect("No window found"); window.set_inner_size(winit::dpi::LogicalSize { @@ -897,6 +901,22 @@ pub fn run_command<A, E>( .send_event(Event::Application(tag(mode))) .expect("Send message to event loop"); } + window::Action::Maximize(value) => { + let window = windows.get(&id).expect("No window found!"); + window.set_maximized(value); + } + window::Action::Minimize(value) => { + let window = windows.get(&id).expect("No window found!"); + window.set_minimized(value); + } + window::Action::ToggleMaximize => { + let window = windows.get(&id).expect("No window found!"); + window.set_maximized(!window.is_maximized()); + } + window::Action::ToggleDecorations => { + let window = windows.get(&id).expect("No window found!"); + window.set_decorations(!window.is_decorated()); + } }, command::Action::System(action) => match action { system::Action::QueryInformation(_tag) => { diff --git a/winit/src/multi_window/state.rs b/winit/src/multi_window/state.rs index a7d51df4..eebdcdf1 100644 --- a/winit/src/multi_window/state.rs +++ b/winit/src/multi_window/state.rs @@ -35,7 +35,7 @@ where let title = application.title(); let scale_factor = application.scale_factor(); let theme = application.theme(); - let appearance = theme.appearance(application.style()); + let appearance = theme.appearance(&application.style()); let viewport = { let physical_size = window.inner_size(); @@ -213,6 +213,6 @@ where // Update theme and appearance self.theme = application.theme(); - self.appearance = self.theme.appearance(application.style()); + self.appearance = self.theme.appearance(&application.style()); } } |