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

shell-app: Evict faded app icons on icon theme change

Browse Source 
When a user changes icon themes, we don't want to waste precious memory
with modified textures from the old icon theme.

https://bugzilla.gnome.org/show_bug.cgi?id=672275
This commit is contained in:
Jasper St. Pierre 2012-03-17 00:20:31 -04:00
parent cf0b6dda25
commit 581d1c5db1
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shell-app.c
View File

@ -332,7 +332,9 @@ shell_app_get_faded_icon (ShellApp *app, int size)
if (!app->entry) if (!app->entry)
return window_backed_app_get_icon (app, size); return window_backed_app_get_icon (app, size);
cache_key = g_strdup_printf ("faded-icon:%s,size=%d", shell_app_get_id (app), size); /* Use icon: prefix so that we get evicted from the cache on
* icon theme changes. */
cache_key = g_strdup_printf ("icon:%s,size=%d,faded", shell_app_get_id (app), size);
data.app = app; data.app = app;
data.size = size; data.size = size;
texture = st_texture_cache_load (st_texture_cache_get_default (), texture = st_texture_cache_load (st_texture_cache_get_default (),

8
src/st/st-texture-cache.c
View File

@ -26,7 +26,7 @@
#include <string.h> #include <string.h>
#include <glib.h> #include <glib.h>
#define CACHE_PREFIX_GICON "gicon:" #define CACHE_PREFIX_ICON "icon:"
#define CACHE_PREFIX_URI "uri:" #define CACHE_PREFIX_URI "uri:"
#define CACHE_PREFIX_URI_FOR_CAIRO "uri-for-cairo:" #define CACHE_PREFIX_URI_FOR_CAIRO "uri-for-cairo:"
#define CACHE_PREFIX_RAW_CHECKSUM "raw-checksum:" #define CACHE_PREFIX_RAW_CHECKSUM "raw-checksum:"
@ -112,7 +112,7 @@ st_texture_cache_evict_icons (StTextureCache *cache)
* for GIcons even when they aren't named icons, but it's not * for GIcons even when they aren't named icons, but it's not
* worth the complexity of parsing the key and calling * worth the complexity of parsing the key and calling
* g_icon_new_for_string(); icon theme changes aren't normal */ * g_icon_new_for_string(); icon theme changes aren't normal */
if (g_str_has_prefix (cache_key, "gicon:")) if (g_str_has_prefix (cache_key, CACHE_PREFIX_ICON))
g_hash_table_iter_remove (&iter); g_hash_table_iter_remove (&iter);
} }
} }
@ -933,7 +933,7 @@ load_gicon_with_colors (StTextureCache *cache,
if (colors) if (colors)
{ {
/* This raises some doubts about the practice of using string keys */ /* This raises some doubts about the practice of using string keys */
key = g_strdup_printf (CACHE_PREFIX_GICON "icon=%s,size=%d,colors=%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x", key = g_strdup_printf (CACHE_PREFIX_ICON "%s,size=%d,colors=%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x,%2x%2x%2x%2x",
gicon_string, size, gicon_string, size,
colors->foreground.red, colors->foreground.blue, colors->foreground.green, colors->foreground.alpha, colors->foreground.red, colors->foreground.blue, colors->foreground.green, colors->foreground.alpha,
colors->warning.red, colors->warning.blue, colors->warning.green, colors->warning.alpha, colors->warning.red, colors->warning.blue, colors->warning.green, colors->warning.alpha,
@ -942,7 +942,7 @@ load_gicon_with_colors (StTextureCache *cache,
} }
else else
{ {
key = g_strdup_printf (CACHE_PREFIX_GICON "icon=%s,size=%d", key = g_strdup_printf (CACHE_PREFIX_ICON "%s,size=%d",
gicon_string, size); gicon_string, size);
} }
g_free (gicon_string); g_free (gicon_string);