me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move Icon to iced crate and introduce Error

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-07-01 06:09:39 +02:00
parent 9a037a23e9
commit a0cc7e4e43
6 changed files with 146 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

38
winit/src/settings.rs
View file

@ -14,7 +14,7 @@ use winit::monitor::MonitorHandle;
use winit::window::WindowBuilder;
/// The settings of an application.
#[derive(Debug, Clone, PartialEq, Default)]
#[derive(Debug, Clone, Default)]
pub struct Settings<Flags> {
/// The [`Window`] settings
///
@ -28,7 +28,7 @@ pub struct Settings<Flags> {
}
/// The window settings of an application.
#[derive(Debug, Clone, PartialEq, Eq)]
#[derive(Debug, Clone)]
pub struct Window {
/// The size of the window.
pub size: (u32, u32),
@ -46,7 +46,7 @@ pub struct Window {
pub decorations: bool,
/// The window icon, which is also usually used in the taskbar
pub icon: Option<Icon>,
pub icon: Option<winit::window::Icon>,
/// Platform specific settings.
pub platform_specific: platform::PlatformSpecific,
@ -69,7 +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_window_icon(self.icon)
.with_fullscreen(conversion::fullscreen(primary_monitor, mode));
if let Some((width, height)) = self.min_size {
@ -108,33 +108,3 @@ impl Default for Window {
}
}
}
/// 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()
}
}