diff options
author | 2023-02-28 13:08:30 -0800 | |
---|---|---|
committer | 2023-02-28 13:08:30 -0800 | |
commit | 51296572c0189eaef8081c46270ff48b7e03258d (patch) | |
tree | 067b3a9102f92e4869f2a63d739a49379a9fb481 /winit/src/icon.rs | |
parent | a131f11a23d3430df58bf67a7c89f4b2284822af (diff) | |
parent | 86b85d1436a44e82a9765f9d82b026faf26e22de (diff) | |
download | iced-51296572c0189eaef8081c46270ff48b7e03258d.tar.gz iced-51296572c0189eaef8081c46270ff48b7e03258d.tar.bz2 iced-51296572c0189eaef8081c46270ff48b7e03258d.zip |
Merge remote-tracking branch 'iced-main/master' into feat/multi-window-support
# Conflicts:
# glutin/src/application.rs
# winit/src/icon.rs
Diffstat (limited to '')
-rw-r--r-- | winit/src/icon.rs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/winit/src/icon.rs b/winit/src/icon.rs index 73b4e037..4113d9d0 100644 --- a/winit/src/icon.rs +++ b/winit/src/icon.rs @@ -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( |