Skip to content

Commit

Permalink
Added convenience functions for window::icon::Icon
Browse files Browse the repository at this point in the history
  • Loading branch information
daladim committed Dec 29, 2021
1 parent 5466d6a commit 53f9df6
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default = ["wgpu", "default_system_font"]
# Enables the `iced_wgpu` renderer
wgpu = ["iced_wgpu"]
# Enables the `Image` widget
image = ["iced_wgpu/image"]
image = ["iced_wgpu/image", "image_rs"]
# Enables the `Svg` widget
svg = ["iced_wgpu/svg"]
# Enables the `Canvas` widget
Expand Down Expand Up @@ -96,6 +96,11 @@ iced_core = { version = "0.4", path = "core" }
iced_futures = { version = "0.3", path = "futures" }
thiserror = "1.0"

[dependencies.image_rs]
version = "0.23"
package = "image"
optional = true

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
iced_winit = { version = "0.3", path = "winit" }
iced_glutin = { version = "0.2", path = "glutin", optional = true }
Expand Down
57 changes: 57 additions & 0 deletions src/window/icon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
use std::fmt;
use std::io;

#[cfg(feature = "image_rs")]
use std::path::Path;

/// The icon of a window.
#[cfg(not(target_arch = "wasm32"))]
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -35,6 +38,39 @@ impl Icon {
) -> Result<Self, Error> {
Ok(Icon)
}

/// Creates an icon from an image file.
///
/// This will return an error in case the file is missing at run-time. You may prefer [`Self::from_file_data`] instead.
#[cfg(feature = "image_rs")]
pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Self, Error> {
let icon = image_rs::io::Reader::open(icon_path)?.decode()?.to_rgba8();

Self::from_rgba(icon.to_vec(), icon.width(), icon.height())
}

/// Creates an icon from the content of an image file.
///
/// This content can be included in your application at compile-time, e.g. using the `include_bytes!` macro. \
/// You can pass an explicit file format. Otherwise, the file format will be guessed at runtime.
#[cfg(feature = "image_rs")]
pub fn from_file_data(
data: &[u8],
explicit_format: Option<image_rs::ImageFormat>,
) -> Result<Self, Error> {
let mut icon = image_rs::io::Reader::new(std::io::Cursor::new(data));
let icon_with_format = match explicit_format {
Some(format) => {
icon.set_format(format);
icon
}
None => icon.with_guessed_format()?,
};

let pixels = icon_with_format.decode()?.to_rgba8();

Self::from_rgba(pixels.to_vec(), pixels.width(), pixels.height())
}
}

/// An error produced when using `Icon::from_rgba` with invalid arguments.
Expand All @@ -60,6 +96,16 @@ pub enum Error {

/// The underlying OS failed to create the icon.
OsError(io::Error),

/// The `image` crate reported an error
#[cfg(feature = "image_rs")]
ImageError(image_rs::error::ImageError),
}

impl From<std::io::Error> for Error {
fn from(os_error: std::io::Error) -> Self {
Error::OsError(os_error)
}
}

#[cfg(not(target_arch = "wasm32"))]
Expand Down Expand Up @@ -93,6 +139,13 @@ impl From<Icon> for iced_winit::winit::window::Icon {
}
}

#[cfg(feature = "image_rs")]
impl From<image_rs::error::ImageError> for Error {
fn from(image_error: image_rs::error::ImageError) -> Self {
Self::ImageError(image_error)
}
}

impl fmt::Display for Error {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Expand Down Expand Up @@ -123,6 +176,10 @@ impl fmt::Display for Error {
icon: {:?}",
e
),
#[cfg(feature = "image_rs")]
Error::ImageError(e) => {
write!(f, "Unable to create icon from a file: {:?}", e)
}
}
}
}
Expand Down

0 comments on commit 53f9df6

Please sign in to comment.