From 65a4dca0d965ca963428231173ca5fb9c672ab52 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 25 Jun 2020 00:32:41 +0200 Subject: Add `min_size` and `max_size` to `window::Settings` --- winit/src/settings.rs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'winit/src/settings.rs') 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(), -- cgit From 9a037a23e9b32d9dbe7086a54d777b5f0550a660 Mon Sep 17 00:00:00 2001 From: Francesco Pasa 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`. --- winit/src/settings.rs | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) (limited to 'winit/src/settings.rs') diff --git a/winit/src/settings.rs b/winit/src/settings.rs index 6799f23f..8cfadf02 100644 --- a/winit/src/settings.rs +++ b/winit/src/settings.rs @@ -14,7 +14,7 @@ use winit::monitor::MonitorHandle; use winit::window::WindowBuilder; /// The settings of an application. -#[derive(Debug, Clone, Copy, PartialEq, Default)] +#[derive(Debug, Clone, PartialEq, Default)] pub struct Settings { /// The [`Window`] settings /// @@ -28,7 +28,7 @@ pub struct Settings { } /// The window settings of an application. -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Debug, Clone, PartialEq, Eq)] pub struct Window { /// The size of the window. pub size: (u32, u32), @@ -45,6 +45,9 @@ pub struct Window { /// Whether the window should have a border, a title bar, etc. pub decorations: bool, + /// The window icon, which is also usually used in the taskbar + pub icon: Option, + /// Platform specific settings. pub platform_specific: platform::PlatformSpecific, } @@ -66,6 +69,7 @@ impl Window { .with_inner_size(winit::dpi::LogicalSize { width, height }) .with_resizable(self.resizable) .with_decorations(self.decorations) + .with_window_icon(self.icon.map(Icon::into)) .with_fullscreen(conversion::fullscreen(primary_monitor, mode)); if let Some((width, height)) = self.min_size { @@ -99,7 +103,38 @@ impl Default for Window { max_size: None, resizable: true, decorations: true, + icon: None, platform_specific: Default::default(), } } } + +/// An Icon +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct Icon { + rgba: Vec, + width: u32, + height: u32, +} + +impl Icon { + /// + pub fn new(rgba: &[u8], width: u32, height: u32) -> Self { + Self { + rgba: rgba.to_vec(), + width, + height, + } + } +} + +impl Into for Icon { + fn into(self) -> winit::window::Icon { + winit::window::Icon::from_rgba( + self.rgba.to_vec(), + self.width, + self.height, + ) + .unwrap() + } +} -- cgit From a0cc7e4e43f16de4c19607f913b7f587c61aa5ef Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 1 Jul 2020 06:09:39 +0200 Subject: Move `Icon` to `iced` crate and introduce `Error` --- winit/src/settings.rs | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'winit/src/settings.rs') diff --git a/winit/src/settings.rs b/winit/src/settings.rs index 8cfadf02..4155bf7d 100644 --- a/winit/src/settings.rs +++ b/winit/src/settings.rs @@ -14,7 +14,7 @@ use winit::monitor::MonitorHandle; use winit::window::WindowBuilder; /// The settings of an application. -#[derive(Debug, Clone, PartialEq, Default)] +#[derive(Debug, Clone, Default)] pub struct Settings { /// The [`Window`] settings /// @@ -28,7 +28,7 @@ pub struct Settings { } /// The window settings of an application. -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone)] pub struct Window { /// The size of the window. pub size: (u32, u32), @@ -46,7 +46,7 @@ pub struct Window { pub decorations: bool, /// The window icon, which is also usually used in the taskbar - pub icon: Option, + pub icon: Option, /// Platform specific settings. pub platform_specific: platform::PlatformSpecific, @@ -69,7 +69,7 @@ impl Window { .with_inner_size(winit::dpi::LogicalSize { width, height }) .with_resizable(self.resizable) .with_decorations(self.decorations) - .with_window_icon(self.icon.map(Icon::into)) + .with_window_icon(self.icon) .with_fullscreen(conversion::fullscreen(primary_monitor, mode)); if let Some((width, height)) = self.min_size { @@ -108,33 +108,3 @@ impl Default for Window { } } } - -/// An Icon -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct Icon { - rgba: Vec, - width: u32, - height: u32, -} - -impl Icon { - /// - pub fn new(rgba: &[u8], width: u32, height: u32) -> Self { - Self { - rgba: rgba.to_vec(), - width, - height, - } - } -} - -impl Into for Icon { - fn into(self) -> winit::window::Icon { - winit::window::Icon::from_rgba( - self.rgba.to_vec(), - self.width, - self.height, - ) - .unwrap() - } -} -- cgit