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

st/icon: Always show empty texture if both gicons are NULL

Browse Source 
Commit 7ff7fb5d3b3ee655b1492226f68aeadac846e247 forgot to clear the
`priv->icon_texture` actor when returning from st_icon_update(), which
means we don't always switch to an empty icon if both gicon properties
are set to NULL.

Fix this and destroy the actor before returning early from
st_icon_update().

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1178
This commit is contained in:
Jonas Dreßler 2020-04-04 10:12:06 +02:00
parent 1ca39e8586
commit 07deda593a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,7 +420,10 @@ st_icon_update (StIcon *icon)
} }
if (priv->gicon == NULL && priv->fallback_gicon == NULL) if (priv->gicon == NULL && priv->fallback_gicon == NULL)
{
g_clear_pointer (&priv->icon_texture, clutter_actor_destroy);
return; return;
}
if (!st_widget_get_resource_scale (ST_WIDGET (icon), &resource_scale)) if (!st_widget_get_resource_scale (ST_WIDGET (icon), &resource_scale))
return; return;