summaryrefslogtreecommitdiffstats
path: root/winit/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2020-07-01 22:44:11 +0200
committerLibravatar GitHub <noreply@github.com>2020-07-01 22:44:11 +0200
commit5190bcea804d74a3373dbb09477770ff4814e866 (patch)
treefe1db142ce6705e35d003ad5d975ec0c17313a8a /winit/src
parent08e13e00f15fb54ced21c0375e7efba4bfbf89a0 (diff)
parenta0cc7e4e43f16de4c19607f913b7f587c61aa5ef (diff)
downloadiced-5190bcea804d74a3373dbb09477770ff4814e866.tar.gz
iced-5190bcea804d74a3373dbb09477770ff4814e866.tar.bz2
iced-5190bcea804d74a3373dbb09477770ff4814e866.zip
Merge pull request #285 from frapa/add_support_for_window_icons
Add support for setting window icon
Diffstat (limited to 'winit/src')
-rw-r--r--winit/src/settings.rs9
1 files changed, 7 insertions, 2 deletions
diff --git a/winit/src/settings.rs b/winit/src/settings.rs
index 6799f23f..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, Copy, PartialEq, Default)]
+#[derive(Debug, Clone, Default)]
pub struct Settings<Flags> {
/// The [`Window`] settings
///
@@ -28,7 +28,7 @@ pub struct Settings<Flags> {
}
/// The window settings of an application.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone)]
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<winit::window::Icon>,
+
/// 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)
.with_fullscreen(conversion::fullscreen(primary_monitor, mode));
if let Some((width, height)) = self.min_size {
@@ -99,6 +103,7 @@ impl Default for Window {
max_size: None,
resizable: true,
decorations: true,
+ icon: None,
platform_specific: Default::default(),
}
}