Merge branch 'master' into feature/pane-grid-titlebar

1 files changed, 31 insertions, 2 deletions

diff --git a/src/window/settings.rs b/src/window/settings.rs
index a31d2af2..2046f2d9 100644
--- a/src/window/settings.rs
+++ b/src/window/settings.rs
@@ -1,22 +1,51 @@
+use crate::window::Icon;
+
 /// The window settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone)]
 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,
 
     /// Whether the window should have a border, a title bar, etc. or not.
     pub decorations: bool,
+
+    /// The icon of the window.
+    pub icon: Option<Icon>,
 }
 
 impl Default for Settings {
     fn default() -> Settings {
         Settings {
             size: (1024, 768),
+            min_size: None,
+            max_size: None,
             resizable: true,
             decorations: true,
+            icon: None,
+        }
+    }
+}
+
+#[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,
+            icon: settings.icon.map(Icon::into),
+            platform_specific: Default::default(),
         }
     }
 }