Merge remote-tracking branch 'iced-main/master' into feat/multi-window-support

# Conflicts:
#	glutin/src/application.rs
#	winit/src/icon.rs
This commit is contained in:
bungoboingo 2023-02-28 13:08:30 -08:00
commit 51296572c0
16 changed files with 79 additions and 103 deletions

View file

@ -6,9 +6,15 @@ use std::io;
use std::path::Path;
/// The icon of a window.
#[derive(Debug, Clone)]
#[derive(Clone)]
pub struct Icon(winit::window::Icon);
impl fmt::Debug for Icon {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
f.debug_tuple("Icon").field(&format_args!("_")).finish()
}
}
impl Icon {
/// Creates an icon from 32bpp RGBA data.
pub fn from_rgba(