diff --git a/desktop/src/window/mac.rs b/desktop/src/window/mac.rs index 4c4010a8b1..6f931e59e5 100644 --- a/desktop/src/window/mac.rs +++ b/desktop/src/window/mac.rs @@ -1,5 +1,6 @@ use winit::event_loop::ActiveEventLoop; use winit::window::{Window, WindowAttributes}; +use winit::platform::macos::{OptionAsAlt, WindowAttributesMacOS}; use crate::consts::APP_NAME; use crate::event::AppEventScheduler; @@ -11,10 +12,11 @@ pub(super) struct NativeWindowImpl { impl super::NativeWindow for NativeWindowImpl { fn configure(attributes: WindowAttributes, _event_loop: &dyn ActiveEventLoop) -> WindowAttributes { - let mac_window = winit::platform::macos::WindowAttributesMacOS::default() + let mac_window = WindowAttributesMacOS::default() .with_titlebar_transparent(true) .with_fullsize_content_view(true) - .with_title_hidden(true); + .with_title_hidden(true) + .with_option_as_alt(OptionAsAlt::Both); attributes.with_platform_attributes(Box::new(mac_window)) } diff --git a/desktop/src/window/win.rs b/desktop/src/window/win.rs index 24ee0ef452..1dfe50aea3 100644 --- a/desktop/src/window/win.rs +++ b/desktop/src/window/win.rs @@ -1,4 +1,6 @@ use winit::event_loop::ActiveEventLoop; +use winit::icon::Icon; +use winit::platform::windows::WinIcon; use winit::window::{Window, WindowAttributes}; use crate::event::AppEventScheduler; @@ -9,8 +11,8 @@ pub(super) struct NativeWindowImpl { impl super::NativeWindow for NativeWindowImpl { fn configure(attributes: WindowAttributes, _event_loop: &dyn ActiveEventLoop) -> WindowAttributes { - if let Ok(win_icon) = winit::platform::windows::WinIcon::from_resource(1, None) { - let icon = winit::icon::Icon(std::sync::Arc::new(win_icon)); + if let Ok(win_icon) = WinIcon::from_resource(1, None) { + let icon = Icon(std::sync::Arc::new(win_icon)); attributes.with_window_icon(Some(icon)) } else { attributes