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

Bug 589276 - Use 0 opacity while loading textures, preserve aspect ratio by default

Browse Source 
When we fail to load a texture, make sure we keep it 0 opacity to avoid
a white square.  Also this is useful to avoid the square while loading
a texture asynchronously.
This commit is contained in:
Colin Walters 2009-08-04 12:28:12 -04:00
parent 898d76af53
commit b1150eb147
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/shell-texture-cache.c
View File

@ -90,6 +90,27 @@ cache_key_destroy (gpointer a)
g_free (akey); g_free (akey);
} }
/* We want to preserve the aspect ratio by default, also the default
* material for an empty texture is full opacity white, which we
* definitely don't want. Skip that by setting 0 opacity.
*/
static ClutterTexture *
create_default_texture (ShellTextureCache *self)
{
ClutterTexture * texture = CLUTTER_TEXTURE (clutter_texture_new ());
g_object_set (texture, "keep-aspect-ratio", TRUE, "opacity", 0, NULL);
return texture;
}
/* Reverse the opacity we added while loading */
static void
set_texture_cogl_texture (ClutterTexture *clutter_texture, CoglHandle cogl_texture)
{
clutter_texture_set_cogl_texture (clutter_texture, cogl_texture);
g_object_set (clutter_texture, "opacity", 255, NULL);
}
static void static void
shell_texture_cache_class_init (ShellTextureCacheClass *klass) shell_texture_cache_class_init (ShellTextureCacheClass *klass)
{ {
@ -678,7 +699,7 @@ on_pixbuf_loaded (GObject *source,
cache_key_destroy (key); cache_key_destroy (key);
} }
clutter_texture_set_cogl_texture (data->texture, texdata); set_texture_cogl_texture (data->texture, texdata);
out: out:
if (data->icon) if (data->icon)
@ -719,7 +740,7 @@ shell_texture_cache_load_gicon (ShellTextureCache *cache,
CoglHandle texdata; CoglHandle texdata;
CacheKey key; CacheKey key;
texture = CLUTTER_TEXTURE (clutter_texture_new ()); texture = create_default_texture (cache);
clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size); clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size);
memset (&key, 0, sizeof(key)); memset (&key, 0, sizeof(key));
@ -752,7 +773,7 @@ shell_texture_cache_load_gicon (ShellTextureCache *cache,
} }
else else
{ {
clutter_texture_set_cogl_texture (texture, texdata); set_texture_cogl_texture (texture, texdata);
} }
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);
@ -781,7 +802,7 @@ shell_texture_cache_load_uri_async (ShellTextureCache *cache,
ClutterTexture *texture; ClutterTexture *texture;
AsyncTextureLoadData *data; AsyncTextureLoadData *data;
texture = CLUTTER_TEXTURE (clutter_texture_new ()); texture = create_default_texture (cache);
data = g_new0 (AsyncTextureLoadData, 1); data = g_new0 (AsyncTextureLoadData, 1);
data->policy = SHELL_TEXTURE_CACHE_POLICY_NONE; data->policy = SHELL_TEXTURE_CACHE_POLICY_NONE;
@ -825,7 +846,7 @@ shell_texture_cache_load_uri_sync (ShellTextureCache *cache,
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
CacheKey key; CacheKey key;
texture = CLUTTER_TEXTURE (clutter_texture_new ()); texture = create_default_texture (cache);
memset (&key, 0, sizeof (CacheKey)); memset (&key, 0, sizeof (CacheKey));
key.policy = policy; key.policy = policy;
@ -845,7 +866,7 @@ shell_texture_cache_load_uri_sync (ShellTextureCache *cache,
texdata = pixbuf_to_cogl_handle (pixbuf); texdata = pixbuf_to_cogl_handle (pixbuf);
g_object_unref (pixbuf); g_object_unref (pixbuf);
clutter_texture_set_cogl_texture (texture, texdata); set_texture_cogl_texture (texture, texdata);
if (policy == SHELL_TEXTURE_CACHE_POLICY_FOREVER) if (policy == SHELL_TEXTURE_CACHE_POLICY_FOREVER)
{ {
@ -855,7 +876,7 @@ shell_texture_cache_load_uri_sync (ShellTextureCache *cache,
cogl_handle_unref (texdata); cogl_handle_unref (texdata);
} }
else else
clutter_texture_set_cogl_texture (texture, texdata); set_texture_cogl_texture (texture, texdata);
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);
} }
@ -887,7 +908,7 @@ shell_texture_cache_load_thumbnail (ShellTextureCache *cache,
CacheKey key; CacheKey key;
CoglHandle texdata; CoglHandle texdata;
texture = CLUTTER_TEXTURE (clutter_texture_new ()); texture = create_default_texture (cache);
clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size); clutter_actor_set_size (CLUTTER_ACTOR (texture), size, size);
memset (&key, 0, sizeof(key)); memset (&key, 0, sizeof(key));
@ -909,7 +930,7 @@ shell_texture_cache_load_thumbnail (ShellTextureCache *cache,
} }
else else
{ {
clutter_texture_set_cogl_texture (texture, texdata); set_texture_cogl_texture (texture, texdata);
} }
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);
@ -993,7 +1014,7 @@ shell_texture_cache_load_recent_thumbnail (ShellTextureCache *cache,
} }
else else
{ {
clutter_texture_set_cogl_texture (texture, texdata); set_texture_cogl_texture (texture, texdata);
} }
return CLUTTER_ACTOR (texture); return CLUTTER_ACTOR (texture);