leyoda/cosmic-freedesktop-icons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: look up $XDG_DATA_DIRS/pixmaps in addition to icons

Browse source
This commit is contained in:
Lily Foster 2024-03-18 10:21:33 -07:00 • committed by Paul Delafosse
parent cd10e6fa61
commit c6c8962d87
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/theme/paths.rs
View file

@ -10,7 +10,7 @@ use crate::theme::error::ThemeError;
pub(crate) static BASE_PATHS: Lazy<Vec<PathBuf>> = Lazy::new(icon_theme_base_paths); pub(crate) static BASE_PATHS: Lazy<Vec<PathBuf>> = Lazy::new(icon_theme_base_paths);
/// Look in $HOME/.icons (for backwards compatibility), in $XDG_DATA_DIRS/icons and in /usr/share/pixmaps (in that order). /// Look in $HOME/.icons (for backwards compatibility), in $XDG_DATA_DIRS/icons, in $XDG_DATA_DIRS/pixmaps and in /usr/share/pixmaps (in that order).
/// Paths that are not found are filtered out. /// Paths that are not found are filtered out.
fn icon_theme_base_paths() -> Vec<PathBuf> { fn icon_theme_base_paths() -> Vec<PathBuf> {
let home_icon_dir = home_dir().expect("No $HOME directory").join(".icons"); let home_icon_dir = home_dir().expect("No $HOME directory").join(".icons");
@ -19,9 +19,11 @@ fn icon_theme_base_paths() -> Vec<PathBuf> {
let mut data_dirs: Vec<_> = bd let mut data_dirs: Vec<_> = bd
.get_data_dirs() .get_data_dirs()
.into_iter() .into_iter()
.map(|p| p.join("icons")) .flat_map(|p| [p.join("icons"), p.join("pixmaps")])
.collect(); .collect();
data_dirs.push(bd.get_data_home().join("icons")); let data_home = bd.get_data_home();
data_dirs.push(data_home.join("icons"));
data_dirs.push(data_home.join("pixmaps"));
data_dirs data_dirs
}) })
.unwrap_or_default(); .unwrap_or_default();