Add `min_size` and `max_size` to `window::Settings`

3 files changed, 42 insertions, 7 deletions

diff --git a/src/settings.rs b/src/settings.rs
index 933829bd..d7ff4cab 100644
--- a/src/settings.rs
+++ b/src/settings.rs
@@ -75,12 +75,7 @@ where
 impl<Flags> From<Settings<Flags>> for iced_winit::Settings<Flags> {
     fn from(settings: Settings<Flags>) -> iced_winit::Settings<Flags> {
         iced_winit::Settings {
-            window: iced_winit::settings::Window {
-                size: settings.window.size,
-                resizable: settings.window.resizable,
-                decorations: settings.window.decorations,
-                platform_specific: Default::default(),
-            },
+            window: settings.window.into(),
             flags: settings.flags,
         }
     }
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(),
+        }
+    }
+}
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 37cb832f..6799f23f 100644
--- a/winit/src/settings.rs
+++ b/winit/src/settings.rs
@@ -33,6 +33,12 @@ pub struct Window {
     /// The 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,
 
@@ -62,6 +68,16 @@ impl Window {
             .with_decorations(self.decorations)
             .with_fullscreen(conversion::fullscreen(primary_monitor, mode));
 
+        if let Some((width, height)) = self.min_size {
+            window_builder = window_builder
+                .with_min_inner_size(winit::dpi::LogicalSize { width, height });
+        }
+
+        if let Some((width, height)) = self.max_size {
+            window_builder = window_builder
+                .with_max_inner_size(winit::dpi::LogicalSize { width, height });
+        }
+
         #[cfg(target_os = "windows")]
         {
             use winit::platform::windows::WindowBuilderExtWindows;
@@ -79,6 +95,8 @@ impl Default for Window {
     fn default() -> Window {
         Window {
             size: (1024, 768),
+            min_size: None,
+            max_size: None,
             resizable: true,
             decorations: true,
             platform_specific: Default::default(),