From 5077f1dc6a6aca5ab84dd89296fb70489393cf57 Mon Sep 17 00:00:00 2001
From: hatoo <hato2000@gmail.com>
Date: Sat, 30 Nov 2019 21:32:46 +0900
Subject: Add platform specific settings

---
 winit/Cargo.toml                  |  3 +++
 winit/src/application.rs          | 21 +++++++++++++++++
 winit/src/settings.rs             | 33 ---------------------------
 winit/src/settings/mod.rs         | 47 +++++++++++++++++++++++++++++++++++++++
 winit/src/settings/not_windows.rs |  6 +++++
 winit/src/settings/windows.rs     |  9 ++++++++
 6 files changed, 86 insertions(+), 33 deletions(-)
 delete mode 100644 winit/src/settings.rs
 create mode 100644 winit/src/settings/mod.rs
 create mode 100644 winit/src/settings/not_windows.rs
 create mode 100644 winit/src/settings/windows.rs

(limited to 'winit')

diff --git a/winit/Cargo.toml b/winit/Cargo.toml
index 2a33255d..bc739c6d 100644
--- a/winit/Cargo.toml
+++ b/winit/Cargo.toml
@@ -15,3 +15,6 @@ iced_native = { version = "0.1.0-alpha", path = "../native" }
 winit = { version = "0.20.0-alpha3", git = "https://github.com/rust-windowing/winit", rev = "709808eb4e69044705fcb214bcc30556db761405"}
 futures = { version = "0.3", features = ["thread-pool"] }
 log = "0.4"
+
+[target.'cfg(target_os = "windows")'.dependencies.winapi]
+version = "0.3.6"
\ No newline at end of file
diff --git a/winit/src/application.rs b/winit/src/application.rs
index 2a0e56b7..a75d57af 100644
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@@ -98,6 +98,7 @@ pub trait Application: Sized {
 
         let (width, height) = settings.window.size;
 
+        #[cfg(not(target_os = "windows"))]
         let window = WindowBuilder::new()
             .with_title(&title)
             .with_inner_size(winit::dpi::LogicalSize {
@@ -109,6 +110,26 @@ pub trait Application: Sized {
             .build(&event_loop)
             .expect("Open window");
 
+        #[cfg(target_os = "windows")]
+        let window = {
+            use winit::platform::windows::WindowBuilderExtWindows;
+
+            let mut window_builder = WindowBuilder::new()
+                .with_title(&title)
+                .with_inner_size(winit::dpi::LogicalSize {
+                    width: f64::from(width),
+                    height: f64::from(height),
+                })
+                .with_resizable(settings.window.resizable)
+                .with_decorations(settings.window.decorations);
+
+            if let Some(parent) = settings.window.platform_specific.parent {
+                window_builder = window_builder.with_parent_window(parent);
+            }
+
+            window_builder.build(&event_loop).expect("Open window")
+        };
+
         let dpi = window.hidpi_factor();
         let mut size = window.inner_size();
         let mut new_size: Option<winit::dpi::LogicalSize> = None;
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
deleted file mode 100644
index 503b9dea..00000000
--- a/winit/src/settings.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-//! Configure your application.
-
-/// The settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub struct Settings {
-    /// The [`Window`] settings
-    ///
-    /// [`Window`]: struct.Window.html
-    pub window: Window,
-}
-
-/// The window settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct Window {
-    /// The size of the window.
-    pub size: (u32, u32),
-
-    /// Whether the window should be resizable or not.
-    pub resizable: bool,
-
-    /// Whether the window should have a border, a title bar, etc.
-    pub decorations: bool,
-}
-
-impl Default for Window {
-    fn default() -> Window {
-        Window {
-            size: (1024, 768),
-            resizable: true,
-            decorations: true,
-        }
-    }
-}
diff --git a/winit/src/settings/mod.rs b/winit/src/settings/mod.rs
new file mode 100644
index 00000000..61a67bdb
--- /dev/null
+++ b/winit/src/settings/mod.rs
@@ -0,0 +1,47 @@
+//! Configure your application.
+
+#[cfg(target_os = "windows")]
+#[path = "windows.rs"]
+pub mod platform;
+
+#[cfg(not(target_os = "windows"))]
+#[path = "not_windows.rs"]
+pub mod platform;
+
+pub use platform::PlatformSpecific;
+
+/// The settings of an application.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub struct Settings {
+    /// The [`Window`] settings
+    ///
+    /// [`Window`]: struct.Window.html
+    pub window: Window,
+}
+
+/// The window settings of an application.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct Window {
+    /// The size of the window.
+    pub size: (u32, u32),
+
+    /// Whether the window should be resizable or not.
+    pub resizable: bool,
+
+    /// Whether the window should have a border, a title bar, etc.
+    pub decorations: bool,
+
+    /// Platform specific Setting.
+    pub platform_specific: platform::PlatformSpecific,
+}
+
+impl Default for Window {
+    fn default() -> Window {
+        Window {
+            size: (1024, 768),
+            resizable: true,
+            decorations: true,
+            platform_specific: Default::default(),
+        }
+    }
+}
diff --git a/winit/src/settings/not_windows.rs b/winit/src/settings/not_windows.rs
new file mode 100644
index 00000000..5d703f84
--- /dev/null
+++ b/winit/src/settings/not_windows.rs
@@ -0,0 +1,6 @@
+#![cfg(not(target_os = "windows"))]
+//! Platform specific settings for not Windows.
+
+/// The platform specific window settings of an application.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub struct PlatformSpecific {}
diff --git a/winit/src/settings/windows.rs b/winit/src/settings/windows.rs
new file mode 100644
index 00000000..76b8d067
--- /dev/null
+++ b/winit/src/settings/windows.rs
@@ -0,0 +1,9 @@
+#![cfg(target_os = "windows")]
+//! Platform specific settings for Windows.
+
+/// The platform specific window settings of an application.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub struct PlatformSpecific {
+    /// Parent Window
+    pub parent: Option<winapi::shared::windef::HWND>,
+}
-- 
cgit