From 0ad5e355bd8c5035f9219aa068418c38a6bbd4b8 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Mon, 2 Sep 2019 15:57:51 +0100 Subject: Add icon_theme_path to find_icon() search if set find_icon() will search in theme appropriate subdirs. --- swaybar/tray/item.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'swaybar') diff --git a/swaybar/tray/item.c b/swaybar/tray/item.c index 027b3001..c8fcd382 100644 --- a/swaybar/tray/item.c +++ b/swaybar/tray/item.c @@ -411,9 +411,15 @@ uint32_t render_sni(cairo_t *cairo, struct swaybar_output *output, double *x, char *icon_name = sni->status[0] == 'N' ? sni->attention_icon_name : sni->icon_name; if (icon_name) { - char *icon_path = find_icon(sni->tray->themes, sni->tray->basedirs, + list_t *icon_search_paths = create_list(); + list_cat(icon_search_paths, sni->tray->basedirs); + if (sni->icon_theme_path) { + list_add(icon_search_paths, sni->icon_theme_path); + } + char *icon_path = find_icon(sni->tray->themes, icon_search_paths, icon_name, ideal_size, output->bar->config->icon_theme, &sni->min_size, &sni->max_size); + list_free(icon_search_paths); 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); -- cgit v1.2.3-54-g00ecf