isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/icon-theme: Remove special-casing of symbolic lookup

Browse Source 
GThemedIcon considers the "-symbolic" suffix when generating
fallback names (i.e. "foo-bar-symbolic", "foo-symbolic", "foo-bar",
"foo").

That means now that we prefer more accurate name matches from any
theme over fallback matches from higher-priority themes, we no
longer need to special-case symbolic names for preferring symbolic
matches over full-color fallbacks.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2824>
This commit is contained in:
Florian Müllner 2023-07-05 21:20:36 +02:00 committed by Marge Bot
parent b3b4eeb496
commit 3028d478b8
1 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/st/st-icon-theme.c
View File

@ -1293,28 +1293,6 @@ real_choose_icon (StIconTheme *icon_theme,
else else
allow_svg = icon_theme->pixbuf_supports_svg; allow_svg = icon_theme->pixbuf_supports_svg;
/* For symbolic icons, do a search in all registered themes first;
* a theme that inherits them from a parent theme might provide
* an alternative full-color version, but still expect the symbolic icon
* to show up instead.
*
* In other words: We prefer symbolic icons in inherited themes over
* generic icons in the theme.
*/
for (i = 0; icon_names[i] && icon_name_is_symbolic (icon_names[i]); i++)
{
icon_name = icon_names[i];
for (l = icon_theme->themes; l; l = l->next)
{
theme = l->data;
icon_info = theme_lookup_icon (theme, icon_name, size, scale, allow_svg);
if (icon_info)
goto out;
}
}
for (i = 0; icon_names[i]; i++) for (i = 0; icon_names[i]; i++)
{ {
icon_name = icon_names[i]; icon_name = icon_names[i];