leyoda/libcosmic-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(widget): improvements to button and icon widgets

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-09-13 15:47:32 +02:00 • committed by Michael Murphy
parent 7f0943924a
commit 9dbc1be269
20 changed files with 399 additions and 558 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/widget/icon/handle.rs
View file

@ -1,7 +1,7 @@
// Copyright 2023 System76 <info@system76.com>
// SPDX-License-Identifier: MPL-2.0
use super::{Builder, Icon};
use super::{Icon, Named};
use crate::widget::{image, svg};
use std::borrow::Cow;
use std::ffi::OsStr;
@ -13,7 +13,7 @@ use std::path::PathBuf;
pub struct Handle {
pub symbolic: bool,
#[setters(skip)]
pub variant: Variant,
pub data: Data,
}
impl Handle {
@ -24,16 +24,12 @@ impl Handle {
#[must_use]
#[derive(Clone, Debug, Hash)]
pub enum Variant {
pub enum Data {
Name(Named),
Image(image::Handle),
Svg(svg::Handle),
}
/// Create an icon handle from its XDG icon name.
pub fn from_name(name: &str) -> Builder {
Builder::new(name)
}
/// Create an icon handle from its path.
pub fn from_path(path: PathBuf) -> Handle {
Handle {
@ -41,10 +37,10 @@ pub fn from_path(path: PathBuf) -> Handle {
.file_stem()
.and_then(OsStr::to_str)
.is_some_and(|name| name.ends_with("-symbolic")),
variant: if path.extension().is_some_and(|ext| ext == OsStr::new("svg")) {
Variant::Svg(svg::Handle::from_path(path))
data: if path.extension().is_some_and(|ext| ext == OsStr::new("svg")) {
Data::Svg(svg::Handle::from_path(path))
} else {
Variant::Image(image::Handle::from_path(path))
Data::Image(image::Handle::from_path(path))
},
}
}
@ -59,7 +55,7 @@ pub fn from_raster_bytes(
) -> Handle {
Handle {
symbolic: false,
variant: Variant::Image(image::Handle::from_memory(bytes)),
data: Data::Image(image::Handle::from_memory(bytes)),
}
}
@ -75,7 +71,7 @@ pub fn from_raster_pixels(
) -> Handle {
Handle {
symbolic: false,
variant: Variant::Image(image::Handle::from_pixels(width, height, pixels)),
data: Data::Image(image::Handle::from_pixels(width, height, pixels)),
}
}
@ -83,6 +79,6 @@ pub fn from_raster_pixels(
pub fn from_svg_bytes(bytes: impl Into<Cow<'static, [u8]>>) -> Handle {
Handle {
symbolic: false,
variant: Variant::Svg(svg::Handle::from_memory(bytes)),
data: Data::Svg(svg::Handle::from_memory(bytes)),
}
}