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

feat(settings): global setting for icon theme

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-01-05 14:16:27 +01:00 • committed by Michael Murphy
parent 043485c68d
commit 7d018a2139
8 changed files with 103 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/widget/icon.rs
View file

@ -10,9 +10,9 @@ use iced::{
ContentFit, Length,
};
use std::{
borrow::Cow, collections::hash_map::DefaultHasher, ffi::OsStr, hash::Hasher, path::Path,
borrow::Cow, collections::hash_map::DefaultHasher, ffi::OsStr, hash::Hash, hash::Hasher,
path::Path, path::PathBuf,
};
use std::{hash::Hash, path::PathBuf};
#[derive(Debug, Hash)]
pub enum IconSource<'a> {
@ -112,18 +112,25 @@ impl<'a> Icon<'a> {
let mut hasher = DefaultHasher::new();
self.hash(&mut hasher);
iced_lazy::lazy(hasher.finish(), move || -> Element<Message> {
if self.theme.is_none() {
crate::settings::DEFAULT_ICON_THEME.with(|f| f.borrow().hash(&mut hasher));
}
let hash = hasher.finish();
iced_lazy::lazy(hash, move || -> Element<Message> {
let name_path_buffer: Option<PathBuf>;
let icon: Option<&Path> = match &self.name {
IconSource::Path(path) => Some(path),
IconSource::Name(name) => {
let mut builder = freedesktop_icons::lookup(name).with_size(self.size);
if let Some(theme) = self.theme.as_deref() {
builder = builder.with_theme(theme);
}
let icon = builder.with_cache().find();
let icon = crate::settings::DEFAULT_ICON_THEME.with(|default_theme| {
let default_theme: &str = &default_theme.borrow();
freedesktop_icons::lookup(name)
.with_size(self.size)
.with_theme(self.theme.as_deref().unwrap_or(default_theme))
.with_cache()
.find()
});
name_path_buffer = if icon.is_none() {
freedesktop_icons::lookup(name)

2
src/widget/spin_button/mod.rs
View file

@ -45,7 +45,7 @@ impl<T: 'static + Copy + Hash + ToString, Message: 'static> SpinButton<T, Messag
let Self { on_change, value } = self;
Element::from(iced_lazy::lazy(
value,
(value, crate::settings::default_icon_theme()),
move || -> Element<'static, SpinMessage> {
container(
row![