diff options
author | 2020-07-01 06:09:39 +0200 | |
---|---|---|
committer | 2020-07-01 06:10:31 +0200 | |
commit | a0cc7e4e43f16de4c19607f913b7f587c61aa5ef (patch) | |
tree | 22006e79b559727221d67165afbfe4e03785d6ac /src/window/settings.rs | |
parent | 9a037a23e9b32d9dbe7086a54d777b5f0550a660 (diff) | |
download | iced-a0cc7e4e43f16de4c19607f913b7f587c61aa5ef.tar.gz iced-a0cc7e4e43f16de4c19607f913b7f587c61aa5ef.tar.bz2 iced-a0cc7e4e43f16de4c19607f913b7f587c61aa5ef.zip |
Move `Icon` to `iced` crate and introduce `Error`
Diffstat (limited to '')
-rw-r--r-- | src/window/settings.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/window/settings.rs b/src/window/settings.rs index 961e8d66..2046f2d9 100644 --- a/src/window/settings.rs +++ b/src/window/settings.rs @@ -1,5 +1,7 @@ +use crate::window::Icon; + /// The window settings of an application. -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Debug, Clone)] pub struct Settings { /// The initial size of the window. pub size: (u32, u32), @@ -16,8 +18,8 @@ pub struct Settings { /// Whether the window should have a border, a title bar, etc. or not. pub decorations: bool, - /// The window icon, which is also usually used in the taskbar - pub icon: Option<iced_winit::settings::Icon>, + /// The icon of the window. + pub icon: Option<Icon>, } impl Default for Settings { @@ -42,7 +44,7 @@ impl From<Settings> for iced_winit::settings::Window { max_size: settings.max_size, resizable: settings.resizable, decorations: settings.decorations, - icon: settings.icon, + icon: settings.icon.map(Icon::into), platform_specific: Default::default(), } } |