zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 18:51:04 +02:00
Code Activity

Merge pull request #135 from JakeStanger/oknozor/master

Browse source 
fix: fallback to default icon theme for notifier items
This commit is contained in:
Jake Stanger 2023-05-01 14:11:05 +01:00 • committed by GitHub
commit bde469816a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/tray.rs
View file

@ -27,14 +27,19 @@ pub struct TrayModule {
/// Attempts to get a GTK `Image` component /// Attempts to get a GTK `Image` component
/// for the status notifier item's icon. /// for the status notifier item's icon.
fn get_image_from_icon_name(item: &StatusNotifierItem) -> Option<Image> { fn get_image_from_icon_name(item: &StatusNotifierItem) -> Option<Image> {
item.icon_theme_path.as_ref().and_then(|path| { let theme = item
let theme = IconTheme::new(); .icon_theme_path
theme.append_search_path(path); .as_ref()
.map(|path| {
item.icon_name.as_ref().and_then(|icon_name| { let theme = IconTheme::new();
let icon_info = theme.lookup_icon(icon_name, 16, IconLookupFlags::empty()); theme.append_search_path(path);
icon_info.map(|icon_info| Image::from_pixbuf(icon_info.load_icon().ok().as_ref())) theme
}) })
.unwrap_or_default();
item.icon_name.as_ref().and_then(|icon_name| {
let icon_info = theme.lookup_icon(icon_name, 16, IconLookupFlags::empty());
icon_info.map(|icon_info| Image::from_pixbuf(icon_info.load_icon().ok().as_ref()))
}) })
} }