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

[StTextureCache] Use size in all cases for cache keys

Browse Source 
Otherwise we're going to be returning the wrong sized image to callers,
and Clutter.Texture will scale it, which will look awful.
This commit is contained in:
Colin Walters 2010-03-13 13:04:36 -05:00
parent 32fd323153
commit b55fd735f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -946,7 +946,7 @@ st_texture_cache_load_gicon (StTextureCache *cache,
GtkIconInfo *info; GtkIconInfo *info;
gicon_string = g_icon_to_string (icon); gicon_string = g_icon_to_string (icon);
key = g_strdup_printf ("%s%s,size=%d", CACHE_PREFIX_GICON, gicon_string, size); key = g_strdup_printf (CACHE_PREFIX_GICON "icon=%s,size=%d", gicon_string, size);
g_free (gicon_string); g_free (gicon_string);
if (create_texture_and_ensure_request (cache, key, size, &request, &texture)) if (create_texture_and_ensure_request (cache, key, size, &request, &texture))
@ -1229,7 +1229,7 @@ st_texture_cache_load_from_data (StTextureCache *cache,
clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size); clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size);
checksum = g_compute_checksum_for_data (G_CHECKSUM_SHA1, data, len); checksum = g_compute_checksum_for_data (G_CHECKSUM_SHA1, data, len);
key = g_strconcat (CACHE_PREFIX_COMPRESSED_CHECKSUM, checksum, NULL); key = g_strdup_printf (CACHE_PREFIX_COMPRESSED_CHECKSUM "checksum=%s,size=%d", checksum, size);
g_free (checksum); g_free (checksum);
texdata = g_hash_table_lookup (cache->priv->keyed_cache, key); texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);
@ -1296,7 +1296,7 @@ st_texture_cache_load_from_raw (StTextureCache *cache,
* pixel data. We ignore that theory. * pixel data. We ignore that theory.
*/ */
checksum = g_compute_checksum_for_data (G_CHECKSUM_SHA1, data, len); checksum = g_compute_checksum_for_data (G_CHECKSUM_SHA1, data, len);
key = g_strconcat (CACHE_PREFIX_RAW_CHECKSUM, checksum, NULL); key = g_strdup_printf (CACHE_PREFIX_RAW_CHECKSUM "checksum=%s,size=%d", checksum, size);
g_free (checksum); g_free (checksum);
texdata = g_hash_table_lookup (cache->priv->keyed_cache, key); texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);
@ -1352,7 +1352,7 @@ st_texture_cache_load_thumbnail (StTextureCache *cache,
texture = create_default_texture (cache); texture = create_default_texture (cache);
clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size); clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size);
key = g_strconcat (CACHE_PREFIX_THUMBNAIL_URI, uri, NULL); key = g_strdup_printf (CACHE_PREFIX_THUMBNAIL_URI "uri=%s,size=%d", uri, size);
texdata = g_hash_table_lookup (cache->priv->keyed_cache, key); texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);
if (!texdata) if (!texdata)
@ -1429,7 +1429,7 @@ st_texture_cache_load_recent_thumbnail (StTextureCache *cache,
texture = CLUTTER_TEXTURE (clutter_texture_new ()); texture = CLUTTER_TEXTURE (clutter_texture_new ());
clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size); clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size);
key = g_strconcat (CACHE_PREFIX_THUMBNAIL_URI, uri, NULL); key = g_strdup_printf (CACHE_PREFIX_THUMBNAIL_URI "uri=%s,size=%d", uri, size);
texdata = g_hash_table_lookup (cache->priv->keyed_cache, key); texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);
if (!texdata) if (!texdata)