Move Icon to iced crate and introduce Error
This commit is contained in:
parent
9a037a23e9
commit
a0cc7e4e43
6 changed files with 146 additions and 40 deletions
|
|
@ -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(),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue