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

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

Browse source 
# Conflicts:
#	native/src/command/action.rs
#	native/src/window/action.rs
#	winit/src/window.rs
This commit is contained in:
Bingus 2023-02-15 14:55:02 -08:00
commit 63fb608d8b
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
55 changed files with 1218 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

15
winit/src/icon.rs
View file

@ -132,10 +132,9 @@ impl fmt::Display for Error {
Error::InvalidData { byte_count } => {
write!(
f,
"The provided RGBA data (with length {:?}) isn't divisble by \
"The provided RGBA data (with length {byte_count:?}) isn't divisble by \
4. Therefore, it cannot be safely interpreted as 32bpp RGBA \
pixels.",
byte_count,
pixels."
)
}
Error::DimensionsMismatch {
@ -145,20 +144,18 @@ impl fmt::Display for Error {
} => {
write!(
f,
"The number of RGBA pixels ({:?}) does not match the provided \
dimensions ({:?}x{:?}).",
pixel_count, width, height,
"The number of RGBA pixels ({pixel_count:?}) does not match the provided \
dimensions ({width:?}x{height:?})."
)
}
Error::OsError(e) => write!(
f,
"The underlying OS failed to create the window \
icon: {:?}",
e
icon: {e:?}"
),
#[cfg(feature = "image_rs")]
Error::ImageError(e) => {
write!(f, "Unable to create icon from a file: {:?}", e)
write!(f, "Unable to create icon from a file: {e:?}")
}
}
}