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

st/icon: Only load default fallback icon if an icon was set and failed to load

Browse Source 
Commit c89d6a633 introduced a default fallback icon that would be displayed in
case the main gicon or the fallback gicon wasn't set or failed to load.

This broke the use case where a StIcon is created but no main icon or
fallback icon are set on purpose, for example the appindicator extension
which always creates a StIcon to represent icons in menu items but the
actual icons are only set if the application provides one, leaving the
menu showing the default fallback ("image-missing") icon for all menu
entries that don't actually have an icon provided by the application.

Fix that by only using the default fallback icon if the provided one
failed to load.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1173

(cherry picked from commit 7ff7fb5d3b)
This commit is contained in:
Andre Moreira Magalhaes 2020-04-03 10:25:25 -03:00 committed by Robert Mader
parent 856adfd1f1
commit 01e894c028
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/st/st-icon.c
View File

@ -418,6 +418,9 @@ st_icon_update (StIcon *icon)
priv->opacity_handler_id = 0;
}
if (priv->gicon == NULL && priv->fallback_gicon == NULL)
return;
if (!st_widget_get_resource_scale (ST_WIDGET (icon), &resource_scale))
return;