diff options
author | 2023-02-28 13:44:36 -0800 | |
---|---|---|
committer | 2023-02-28 13:44:36 -0800 | |
commit | e36daa6f937abd7cb2071fd8852a3c12263944ea (patch) | |
tree | b951dd883d24963cdd3de66423feb42971684c25 /winit/src/settings | |
parent | 51296572c0189eaef8081c46270ff48b7e03258d (diff) | |
download | iced-e36daa6f937abd7cb2071fd8852a3c12263944ea.tar.gz iced-e36daa6f937abd7cb2071fd8852a3c12263944ea.tar.bz2 iced-e36daa6f937abd7cb2071fd8852a3c12263944ea.zip |
Removed glutin MW support and reverted glutin changes back to Iced master since it's being axed as we speak.
Diffstat (limited to '')
-rw-r--r-- | winit/src/settings.rs | 8 | ||||
-rw-r--r-- | winit/src/settings/windows.rs | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/winit/src/settings.rs b/winit/src/settings.rs index b26de542..88d7c1de 100644 --- a/winit/src/settings.rs +++ b/winit/src/settings.rs @@ -179,9 +179,9 @@ impl Window { { use winit::platform::windows::WindowBuilderExtWindows; - // if let Some(parent) = self.platform_specific.parent { - // window_builder = window_builder.with_parent_window(parent); - // } + if let Some(parent) = self.platform_specific.parent { + window_builder = window_builder.with_parent_window(parent); + } window_builder = window_builder .with_drag_and_drop(self.platform_specific.drag_and_drop); @@ -227,7 +227,7 @@ impl From<iced_native::window::Settings> for Window { fn from(settings: iced_native::window::Settings) -> Self { Self { size: settings.size, - position: Position::from(settings.position), + position: settings.position, min_size: settings.min_size, max_size: settings.max_size, visible: settings.visible, diff --git a/winit/src/settings/windows.rs b/winit/src/settings/windows.rs index 0891ec2c..ff03a9c5 100644 --- a/winit/src/settings/windows.rs +++ b/winit/src/settings/windows.rs @@ -4,7 +4,7 @@ #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub struct PlatformSpecific { /// Parent window - // pub parent: Option<winit::platform::windows::HWND>, + pub parent: Option<winit::platform::windows::HWND>, /// Drag and drop support pub drag_and_drop: bool, @@ -13,7 +13,7 @@ pub struct PlatformSpecific { impl Default for PlatformSpecific { fn default() -> Self { Self { - // parent: None, + parent: None, drag_and_drop: true, } } |