PolytreeDE/rofi
1
0
Fork 0
mirror of https://github.com/davatorium/rofi.git synced 2024-11-18 13:54:36 -05:00
Code Releases Activity

[Window] Small fixes to prefer-icon-theme option

Browse source 
Thanks to Kafva (https://github.com/Kafva) for the original patch.

Issue: #1702
This commit is contained in:
Dave Davenport 2022-10-22 11:10:35 +02:00
parent 96a69a54c3
commit 60fcbbb10e
1 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/modes/window.c
View file

@ -1075,25 +1075,17 @@ static cairo_surface_t *_get_icon(const Mode *sw, unsigned int selected_line,
c->icon_checked = TRUE;
}
if (c->icon == NULL && c->class && c->icon_theme_checked == FALSE) {
g_warning("icon theme icon: %s %u", c->class, size);
if (c->icon_fetch_uid > 0) {
c->icon_theme_checked =
rofi_icon_fetcher_get_ex(c->icon_fetch_uid, &(c->icon));
if (c->icon) {
cairo_surface_reference(c->icon);
}
return c->icon;
}
if (c->icon_fetch_uid == 0) {
char *class_lower = g_utf8_strdown(c->class, -1);
c->icon_fetch_uid = rofi_icon_fetcher_query(class_lower, size);
g_free(class_lower);
c->icon_fetch_size = size;
}
c->icon_theme_checked =
rofi_icon_fetcher_get_ex(c->icon_fetch_uid, &(c->icon));
if (c->icon) {
cairo_surface_reference(c->icon);
}
return c->icon;
}
} else {
if (c->icon == NULL && c->class && c->icon_theme_checked == FALSE) {
@ -1109,7 +1101,8 @@ static cairo_surface_t *_get_icon(const Mode *sw, unsigned int selected_line,
cairo_surface_reference(c->icon);
}
}
if (c->icon == NULL && c->icon_checked == FALSE) {
if (c->icon_theme_checked == TRUE && c->icon == NULL &&
c->icon_checked == FALSE) {
c->icon = get_net_wm_icon(rmpd->ids->array[selected_line], size);
c->icon_checked = TRUE;
}