alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

swaybar: use KDE's SNI IconThemePath property

Browse source
This commit is contained in:
Ian Fan 2018-12-17 23:52:15 +00:00
parent 371089f62c
commit 9e31f5d79c
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/swaybar/tray/item.h
View file

@ -34,6 +34,7 @@ struct swaybar_sni {
list_t *attention_icon_pixmap; // struct swaybar_pixmap * list_t *attention_icon_pixmap; // struct swaybar_pixmap *
bool item_is_menu; bool item_is_menu;
char *menu; char *menu;
char *icon_theme_path; // non-standard KDE property
}; };
struct swaybar_sni *create_sni(char *id, struct swaybar_tray *tray); struct swaybar_sni *create_sni(char *id, struct swaybar_tray *tray);

5
swaybar/tray/item.c
View file

@ -228,6 +228,7 @@ struct swaybar_sni *create_sni(char *id, struct swaybar_tray *tray) {
sni->service = strndup(id, path_ptr - id); sni->service = strndup(id, path_ptr - id);
sni->path = strdup(path_ptr); sni->path = strdup(path_ptr);
sni->interface = "org.kde.StatusNotifierItem"; sni->interface = "org.kde.StatusNotifierItem";
sni_get_property_async(sni, "IconThemePath", "s", &sni->icon_theme_path);
} }
// Ignored: Category, Id, Title, WindowId, OverlayIconName, // Ignored: Category, Id, Title, WindowId, OverlayIconName,
@ -353,6 +354,10 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x,
char *icon_path = find_icon(sni->tray->themes, sni->tray->basedirs, char *icon_path = find_icon(sni->tray->themes, sni->tray->basedirs,
icon_name, ideal_size, output->bar->config->icon_theme, icon_name, ideal_size, output->bar->config->icon_theme,
&sni->min_size, &sni->max_size); &sni->min_size, &sni->max_size);
if (!icon_path && sni->icon_theme_path) {
icon_path = find_icon_in_dir(icon_name, sni->icon_theme_path,
&sni->min_size, &sni->max_size);
}
if (icon_path) { if (icon_path) {
cairo_surface_destroy(sni->icon); cairo_surface_destroy(sni->icon);
sni->icon = load_background_image(icon_path); sni->icon = load_background_image(icon_path);