diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-04-17 23:41:12 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2023-04-17 23:41:12 +0200 |
| commit | 4bae457c37b499f3cfddbdac9ff37a34cbce61d5 (patch) | |
| tree | 79af93b2f7fabca1687900b48b165c5c74dcd26f /winit/src/settings.rs | |
| parent | c0431aedd3bbef4161456f2fa5f29866e8f17fc5 (diff) | |
| parent | 4b05f42fd6d18bf572b772dd60d6a4309ea5f343 (diff) | |
| download | iced-4bae457c37b499f3cfddbdac9ff37a34cbce61d5.tar.gz iced-4bae457c37b499f3cfddbdac9ff37a34cbce61d5.tar.bz2 iced-4bae457c37b499f3cfddbdac9ff37a34cbce61d5.zip | |
Merge branch 'master' into advanced-text
Diffstat (limited to 'winit/src/settings.rs')
| -rw-r--r-- | winit/src/settings.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/winit/src/settings.rs b/winit/src/settings.rs index 5c64727b..be0ab329 100644 --- a/winit/src/settings.rs +++ b/winit/src/settings.rs @@ -22,6 +22,7 @@ mod platform; pub use platform::PlatformSpecific; use crate::conversion; +use crate::core::window::Icon; use crate::Position; use winit::monitor::MonitorHandle; @@ -84,7 +85,7 @@ pub struct Window { pub always_on_top: bool, /// The window icon, which is also usually used in the taskbar - pub icon: Option<winit::window::Icon>, + pub icon: Option<Icon>, /// Platform specific settings. pub platform_specific: platform::PlatformSpecific, @@ -126,8 +127,9 @@ impl Window { .with_resizable(self.resizable) .with_decorations(self.decorations) .with_transparent(self.transparent) - .with_window_icon(self.icon) - .with_always_on_top(self.always_on_top); + .with_window_icon(self.icon.and_then(conversion::icon)) + .with_always_on_top(self.always_on_top) + .with_visible(self.visible); if let Some(position) = conversion::position( primary_monitor.as_ref(), |