Add support for setting window icon
This adds a new property from Settings:🪟:iconand a Icon struct which can be converted to winit:🪟: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`.
This commit is contained in:
parent
1bc69e7a8a
commit
9a037a23e9
@ -2,7 +2,7 @@
|
|||||||
use crate::window;
|
use crate::window;
|
||||||
|
|
||||||
/// The settings of an application.
|
/// The settings of an application.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct Settings<Flags> {
|
pub struct Settings<Flags> {
|
||||||
/// The window settings.
|
/// The window settings.
|
||||||
///
|
///
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/// The window settings of an application.
|
/// The window settings of an application.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct Settings {
|
pub struct Settings {
|
||||||
/// The initial size of the window.
|
/// The initial size of the window.
|
||||||
pub size: (u32, u32),
|
pub size: (u32, u32),
|
||||||
@ -15,6 +15,9 @@ pub struct Settings {
|
|||||||
|
|
||||||
/// Whether the window should have a border, a title bar, etc. or not.
|
/// Whether the window should have a border, a title bar, etc. or not.
|
||||||
pub decorations: bool,
|
pub decorations: bool,
|
||||||
|
|
||||||
|
/// The window icon, which is also usually used in the taskbar
|
||||||
|
pub icon: Option<iced_winit::settings::Icon>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Settings {
|
impl Default for Settings {
|
||||||
@ -25,6 +28,7 @@ impl Default for Settings {
|
|||||||
max_size: None,
|
max_size: None,
|
||||||
resizable: true,
|
resizable: true,
|
||||||
decorations: true,
|
decorations: true,
|
||||||
|
icon: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -38,6 +42,7 @@ impl From<Settings> for iced_winit::settings::Window {
|
|||||||
max_size: settings.max_size,
|
max_size: settings.max_size,
|
||||||
resizable: settings.resizable,
|
resizable: settings.resizable,
|
||||||
decorations: settings.decorations,
|
decorations: settings.decorations,
|
||||||
|
icon: settings.icon,
|
||||||
platform_specific: Default::default(),
|
platform_specific: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -38,5 +38,6 @@ pub use clipboard::Clipboard;
|
|||||||
pub use mode::Mode;
|
pub use mode::Mode;
|
||||||
pub use proxy::Proxy;
|
pub use proxy::Proxy;
|
||||||
pub use settings::Settings;
|
pub use settings::Settings;
|
||||||
|
pub use settings::Icon;
|
||||||
|
|
||||||
pub use iced_graphics::Viewport;
|
pub use iced_graphics::Viewport;
|
||||||
|
@ -14,7 +14,7 @@ use winit::monitor::MonitorHandle;
|
|||||||
use winit::window::WindowBuilder;
|
use winit::window::WindowBuilder;
|
||||||
|
|
||||||
/// The settings of an application.
|
/// The settings of an application.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Default)]
|
#[derive(Debug, Clone, PartialEq, Default)]
|
||||||
pub struct Settings<Flags> {
|
pub struct Settings<Flags> {
|
||||||
/// The [`Window`] settings
|
/// The [`Window`] settings
|
||||||
///
|
///
|
||||||
@ -28,7 +28,7 @@ pub struct Settings<Flags> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// The window settings of an application.
|
/// The window settings of an application.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct Window {
|
pub struct Window {
|
||||||
/// The size of the window.
|
/// The size of the window.
|
||||||
pub size: (u32, u32),
|
pub size: (u32, u32),
|
||||||
@ -45,6 +45,9 @@ pub struct Window {
|
|||||||
/// Whether the window should have a border, a title bar, etc.
|
/// Whether the window should have a border, a title bar, etc.
|
||||||
pub decorations: bool,
|
pub decorations: bool,
|
||||||
|
|
||||||
|
/// The window icon, which is also usually used in the taskbar
|
||||||
|
pub icon: Option<Icon>,
|
||||||
|
|
||||||
/// Platform specific settings.
|
/// Platform specific settings.
|
||||||
pub platform_specific: platform::PlatformSpecific,
|
pub platform_specific: platform::PlatformSpecific,
|
||||||
}
|
}
|
||||||
@ -66,6 +69,7 @@ impl Window {
|
|||||||
.with_inner_size(winit::dpi::LogicalSize { width, height })
|
.with_inner_size(winit::dpi::LogicalSize { width, height })
|
||||||
.with_resizable(self.resizable)
|
.with_resizable(self.resizable)
|
||||||
.with_decorations(self.decorations)
|
.with_decorations(self.decorations)
|
||||||
|
.with_window_icon(self.icon.map(Icon::into))
|
||||||
.with_fullscreen(conversion::fullscreen(primary_monitor, mode));
|
.with_fullscreen(conversion::fullscreen(primary_monitor, mode));
|
||||||
|
|
||||||
if let Some((width, height)) = self.min_size {
|
if let Some((width, height)) = self.min_size {
|
||||||
@ -99,7 +103,38 @@ impl Default for Window {
|
|||||||
max_size: None,
|
max_size: None,
|
||||||
resizable: true,
|
resizable: true,
|
||||||
decorations: true,
|
decorations: true,
|
||||||
|
icon: None,
|
||||||
platform_specific: Default::default(),
|
platform_specific: Default::default(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// An Icon
|
||||||
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
pub struct Icon {
|
||||||
|
rgba: Vec<u8>,
|
||||||
|
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<winit::window::Icon> for Icon {
|
||||||
|
fn into(self) -> winit::window::Icon {
|
||||||
|
winit::window::Icon::from_rgba(
|
||||||
|
self.rgba.to_vec(),
|
||||||
|
self.width,
|
||||||
|
self.height,
|
||||||
|
)
|
||||||
|
.unwrap()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user