zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-04-19 19:34:24 +02:00
Code Activity

fix(tray): icons sometimes not showing

Browse source 
Previously icons were only loaded from the theme based on the provided icon name. Sometimes no icon name was provided, and sometimes the name is just missing from the theme.

This falls back to using the provided pixbuf, and then falls back to just displaying the name as text if that is not available.
This commit is contained in:
Jake Stanger 2023-04-16 21:37:47 +01:00
parent 8e99fd4d0f
commit a87d8d5c30
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/modules/tray.rs
View file

@ -3,8 +3,9 @@ use crate::config::CommonConfig;
use crate::modules::{Module, ModuleInfo, ModuleUpdateEvent, ModuleWidget, WidgetContext};
use crate::{await_sync, try_send};
use color_eyre::Result;
use gtk::gio::{Cancellable, MemoryInputStream};
use gtk::prelude::*;
use gtk::{IconLookupFlags, IconTheme, Image, Menu, MenuBar, MenuItem, SeparatorMenuItem};
use gtk::{gdk_pixbuf, IconLookupFlags, IconTheme, Image, Label, Menu, MenuBar, MenuItem, SeparatorMenuItem};
use serde::Deserialize;
use std::collections::HashMap;
use stray::message::menu::{MenuItem as MenuItemInfo, MenuType};
@ -147,12 +148,35 @@ impl Module<MenuBar> for TrayModule {
address,
menu,
} => {
let addr = &address;
let menu_item = widgets.remove(address.as_str()).unwrap_or_else(|| {
let menu_item = MenuItem::new();
menu_item.style_context().add_class("item");
if let Some(image) = get_icon(&item) {
image.set_widget_name(address.as_str());
menu_item.add(&image);
} else if let Some(pixmap) =
item.icon_pixmap.as_ref().and_then(|vec| vec.first())
{
let bytes = glib::Bytes::from(&pixmap.pixels);
let stream = MemoryInputStream::from_bytes(&bytes);
let pixbuf = gdk_pixbuf::Pixbuf::from_stream_at_scale(
&stream,
pixmap.width,
pixmap.height,
true,
Some(&Cancellable::new()),
);
if let Ok(pixbuf) = pixbuf {
let image = Image::new();
image.set_pixbuf(Some(&pixbuf));
menu_item.add(&image);
}
} else {
let label = Label::new(Some(&item.title.as_ref().unwrap_or(addr)));
menu_item.add(&label);
}
container.add(&menu_item);
menu_item.show_all();