callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

themingengine: use cairo image surfaces to render state effects

Browse Source 
This makes the code cleaner and allows this to be re-used in a
pixbuf-less future.
This commit is contained in:
Cosimo Cecchi 2011-06-06 10:23:44 -04:00 committed by Benjamin Otte
parent 2446aef0ea
commit 0cd810ff7c
1 changed files with 40 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
gtk/gtkthemingengine.c
View File

@ -3130,53 +3130,24 @@ lookup_icon_size (GtkThemingEngine *engine,
return gtk_icon_size_lookup_for_settings (settings, size, width, height); return gtk_icon_size_lookup_for_settings (settings, size, width, height);
} }
/* Kudos to the gnome-panel guys. */
static void static void
colorshift_pixbuf (GdkPixbuf *src, colorshift_source (cairo_t *cr,
GdkPixbuf *dest, gdouble shift)
gint shift)
{ {
gint i, j; cairo_pattern_t *source;
gint width, height, has_alpha, src_rowstride, dest_rowstride;
guchar *target_pixels;
guchar *original_pixels;
guchar *pix_src;
guchar *pix_dest;
int val;
guchar r, g, b;
has_alpha = gdk_pixbuf_get_has_alpha (src); cairo_save (cr);
width = gdk_pixbuf_get_width (src); cairo_paint (cr);
height = gdk_pixbuf_get_height (src);
src_rowstride = gdk_pixbuf_get_rowstride (src);
dest_rowstride = gdk_pixbuf_get_rowstride (dest);
original_pixels = gdk_pixbuf_get_pixels (src);
target_pixels = gdk_pixbuf_get_pixels (dest);
for (i = 0; i < height; i++) source = cairo_pattern_reference (cairo_get_source (cr));
{
pix_dest = target_pixels + i * dest_rowstride;
pix_src = original_pixels + i * src_rowstride;
for (j = 0; j < width; j++) cairo_set_source_rgb (cr, shift, shift, shift);
{ cairo_set_operator (cr, CAIRO_OPERATOR_COLOR_DODGE);
r = *(pix_src++);
g = *(pix_src++);
b = *(pix_src++);
val = r + shift; cairo_mask (cr, source);
*(pix_dest++) = CLAMP (val, 0, 255);
val = g + shift; cairo_pattern_destroy (source);
*(pix_dest++) = CLAMP (val, 0, 255); cairo_restore (cr);
val = b + shift;
*(pix_dest++) = CLAMP (val, 0, 255);
if (has_alpha)
*(pix_dest++) = *(pix_src++);
}
}
} }
static GdkPixbuf * static GdkPixbuf *
@ -3190,6 +3161,8 @@ gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine *engine,
GtkStateFlags state; GtkStateFlags state;
gint width = 1; gint width = 1;
gint height = 1; gint height = 1;
cairo_t *cr;
cairo_surface_t *surface;
base_pixbuf = gtk_icon_source_get_pixbuf (source); base_pixbuf = gtk_icon_source_get_pixbuf (source);
state = gtk_theming_engine_get_state (engine); state = gtk_theming_engine_get_state (engine);
@ -3217,16 +3190,36 @@ gtk_theming_engine_render_icon_pixbuf (GtkThemingEngine *engine,
{ {
if (state & GTK_STATE_FLAG_INSENSITIVE) if (state & GTK_STATE_FLAG_INSENSITIVE)
{ {
stated = gdk_pixbuf_copy (scaled); surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
gdk_pixbuf_saturate_and_pixelate (scaled, stated, gdk_pixbuf_get_width (scaled),
0.8, TRUE); gdk_pixbuf_get_height (scaled));
cr = cairo_create (surface);
gdk_cairo_set_source_pixbuf (cr, scaled, 0, 0);
cairo_paint_with_alpha (cr, 0.5);
cairo_destroy (cr);
g_object_unref (scaled); g_object_unref (scaled);
stated = gdk_pixbuf_get_from_surface (surface, 0, 0,
cairo_image_surface_get_width (surface),
cairo_image_surface_get_height (surface));
} }
else if (state & GTK_STATE_FLAG_PRELIGHT) else if (state & GTK_STATE_FLAG_PRELIGHT)
{ {
stated = gdk_pixbuf_copy (scaled); surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
colorshift_pixbuf (scaled, stated, 30); gdk_pixbuf_get_width (scaled),
gdk_pixbuf_get_height (scaled));
cr = cairo_create (surface);
gdk_cairo_set_source_pixbuf (cr, scaled, 0, 0);
colorshift_source (cr, 0.10);
cairo_destroy (cr);
g_object_unref (scaled); g_object_unref (scaled);
stated = gdk_pixbuf_get_from_surface (surface, 0, 0,
cairo_image_surface_get_width (surface),
cairo_image_surface_get_height (surface));
} }
else else
stated = scaled; stated = scaled;