Skip to content

Commit

Permalink
Add support for setting window icon
Browse files Browse the repository at this point in the history
This adds a new property from Settings::window::iconand a Icon struct which can be converted to winit::window::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`.
  • Loading branch information
frapa authored and hecrj committed Jul 1, 2020
1 parent 1bc69e7 commit 9a037a2
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
use crate::window;

/// The settings of an application.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Settings<Flags> {
/// The window settings.
///
Expand Down
7 changes: 6 additions & 1 deletion src/window/settings.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/// The window settings of an application.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Settings {
/// The initial size of the window.
pub size: (u32, u32),
Expand All @@ -15,6 +15,9 @@ 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>,
}

impl Default for Settings {
Expand All @@ -25,6 +28,7 @@ impl Default for Settings {
max_size: None,
resizable: true,
decorations: true,
icon: None,
}
}
}
Expand All @@ -38,6 +42,7 @@ impl From<Settings> for iced_winit::settings::Window {
max_size: settings.max_size,
resizable: settings.resizable,
decorations: settings.decorations,
icon: settings.icon,
platform_specific: Default::default(),
}
}
Expand Down
1 change: 1 addition & 0 deletions winit/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@ pub use clipboard::Clipboard;
pub use mode::Mode;
pub use proxy::Proxy;
pub use settings::Settings;
pub use settings::Icon;

pub use iced_graphics::Viewport;
39 changes: 37 additions & 2 deletions winit/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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, PartialEq, Default)]
pub struct Settings<Flags> {
/// The [`Window`] settings
///
Expand All @@ -28,7 +28,7 @@ pub struct Settings<Flags> {
}

/// The window settings of an application.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Window {
/// The size of the window.
pub size: (u32, u32),
Expand All @@ -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<Icon>,

/// Platform specific settings.
pub platform_specific: platform::PlatformSpecific,
}
Expand All @@ -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.map(Icon::into))
.with_fullscreen(conversion::fullscreen(primary_monitor, mode));

if let Some((width, height)) = self.min_size {
Expand Down Expand Up @@ -99,7 +103,38 @@ impl Default for Window {
max_size: None,
resizable: true,
decorations: true,
icon: None,
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()
}
}

0 comments on commit 9a037a2

Please sign in to comment.