From 65a4dca0d965ca963428231173ca5fb9c672ab52 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 25 Jun 2020 00:32:41 +0200
Subject: Add `min_size` and `max_size` to `window::Settings`

---
 src/window/settings.rs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'src/window/settings.rs')

diff --git a/src/window/settings.rs b/src/window/settings.rs
index a31d2af2..eb997899 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,9 +1,15 @@
 /// The window settings of an application.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct Settings {
-    /// The size of the window.
+    /// The initial size of the window.
     pub size: (u32, u32),
 
+    /// The minimum size of the window.
+    pub min_size: Option<(u32, u32)>,
+
+    /// The maximum size of the window.
+    pub max_size: Option<(u32, u32)>,
+
     /// Whether the window should be resizable or not.
     pub resizable: bool,
 
@@ -15,8 +21,24 @@ impl Default for Settings {
     fn default() -> Settings {
         Settings {
             size: (1024, 768),
+            min_size: None,
+            max_size: None,
             resizable: true,
             decorations: true,
         }
     }
 }
+
+#[cfg(not(target_arch = "wasm32"))]
+impl From<Settings> for iced_winit::settings::Window {
+    fn from(settings: Settings) -> Self {
+        Self {
+            size: settings.size,
+            min_size: settings.min_size,
+            max_size: settings.max_size,
+            resizable: settings.resizable,
+            decorations: settings.decorations,
+            platform_specific: Default::default(),
+        }
+    }
+}
-- 
cgit 


From 9a037a23e9b32d9dbe7086a54d777b5f0550a660 Mon Sep 17 00:00:00 2001
From: Francesco Pasa <francescopasa@gmail.com>
Date: Sat, 11 Apr 2020 15:16:10 +0200
Subject: Add support for setting window icon

This adds a new property from Settings::window::iconand a Icon struct which can be converted to winit::window::Icon.

It also adds code to display this icon in Application::run. Due to the fact that the Icon struct is non copyable, I also had to remove the Copy trait from all Settings, both in `iced` and `iced_winit`.
---
 src/window/settings.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/window/settings.rs')

diff --git a/src/window/settings.rs b/src/window/settings.rs
index eb997899..961e8d66 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,5 +1,5 @@
 /// The window settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Settings {
     /// The initial size of the window.
     pub size: (u32, u32),
@@ -15,6 +15,9 @@ pub struct Settings {
 
     /// Whether the window should have a border, a title bar, etc. or not.
     pub decorations: bool,
+
+    /// The window icon, which is also usually used in the taskbar
+    pub icon: Option<iced_winit::settings::Icon>,
 }
 
 impl Default for Settings {
@@ -25,6 +28,7 @@ impl Default for Settings {
             max_size: None,
             resizable: true,
             decorations: true,
+            icon: None,
         }
     }
 }
@@ -38,6 +42,7 @@ impl From<Settings> for iced_winit::settings::Window {
             max_size: settings.max_size,
             resizable: settings.resizable,
             decorations: settings.decorations,
+            icon: settings.icon,
             platform_specific: Default::default(),
         }
     }
-- 
cgit 


From a0cc7e4e43f16de4c19607f913b7f587c61aa5ef Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 1 Jul 2020 06:09:39 +0200
Subject: Move `Icon` to `iced` crate and introduce `Error`

---
 src/window/settings.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/window/settings.rs')

diff --git a/src/window/settings.rs b/src/window/settings.rs
index 961e8d66..2046f2d9 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,5 +1,7 @@
+use crate::window::Icon;
+
 /// The window settings of an application.
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 pub struct Settings {
     /// The initial size of the window.
     pub size: (u32, u32),
@@ -16,8 +18,8 @@ pub struct Settings {
     /// Whether the window should have a border, a title bar, etc. or not.
     pub decorations: bool,
 
-    /// The window icon, which is also usually used in the taskbar
-    pub icon: Option<iced_winit::settings::Icon>,
+    /// The icon of the window.
+    pub icon: Option<Icon>,
 }
 
 impl Default for Settings {
@@ -42,7 +44,7 @@ impl From<Settings> for iced_winit::settings::Window {
             max_size: settings.max_size,
             resizable: settings.resizable,
             decorations: settings.decorations,
-            icon: settings.icon,
+            icon: settings.icon.map(Icon::into),
             platform_specific: Default::default(),
         }
     }
-- 
cgit