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

[ShellApp] When fading, don't read alpha channel if none available

Browse Source
This commit is contained in:
Colin Walters 2010-03-13 12:56:15 -05:00
parent 3aea09b614
commit 32fd323153
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shell-app.c
View File

@ -75,6 +75,7 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
CoglHandle texture; CoglHandle texture;
gint width, height, rowstride; gint width, height, rowstride;
guint8 n_channels; guint8 n_channels;
gboolean have_alpha;
gint fade_start; gint fade_start;
gint fade_range; gint fade_range;
guint i, j; guint i, j;
@ -109,6 +110,7 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
rowstride = gdk_pixbuf_get_rowstride (pixbuf); rowstride = gdk_pixbuf_get_rowstride (pixbuf);
n_channels = gdk_pixbuf_get_n_channels (pixbuf); n_channels = gdk_pixbuf_get_n_channels (pixbuf);
orig_pixels = gdk_pixbuf_get_pixels (pixbuf); orig_pixels = gdk_pixbuf_get_pixels (pixbuf);
have_alpha = gdk_pixbuf_get_has_alpha (pixbuf);
pixbuf_byte_size = (height - 1) * rowstride + pixbuf_byte_size = (height - 1) * rowstride +
+ width * ((n_channels * gdk_pixbuf_get_bits_per_sample (pixbuf) + 7) / 8); + width * ((n_channels * gdk_pixbuf_get_bits_per_sample (pixbuf) + 7) / 8);
@ -127,14 +129,15 @@ shell_app_create_faded_icon_cpu (StTextureCache *cache,
pixel[0] = 0.5 + pixel[0] * fade; pixel[0] = 0.5 + pixel[0] * fade;
pixel[1] = 0.5 + pixel[1] * fade; pixel[1] = 0.5 + pixel[1] * fade;
pixel[2] = 0.5 + pixel[2] * fade; pixel[2] = 0.5 + pixel[2] * fade;
pixel[3] = 0.5 + pixel[3] * fade; if (have_alpha)
pixel[3] = 0.5 + pixel[3] * fade;
} }
} }
texture = cogl_texture_new_from_data (width, texture = cogl_texture_new_from_data (width,
height, height,
COGL_TEXTURE_NONE, COGL_TEXTURE_NONE,
gdk_pixbuf_get_has_alpha (pixbuf) ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888, have_alpha ? COGL_PIXEL_FORMAT_RGBA_8888 : COGL_PIXEL_FORMAT_RGB_888,
COGL_PIXEL_FORMAT_ANY, COGL_PIXEL_FORMAT_ANY,
rowstride, rowstride,
pixels); pixels);