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

render: Make image effect not depend on state

Browse Source 
Instead rely on -gtk-image-effect only. Adwaita should already work this
way.

Relying on state was a leftover feature from the GTK 2 days.
This commit is contained in:
Benjamin Otte
2015-03-18 15:22:09 +01:00
parent 0529e15d61
commit 99c4f2dd39
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtkrender.c
View File

@ -1077,7 +1077,6 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context,
GdkPixbuf *scaled; GdkPixbuf *scaled;
GdkPixbuf *stated; GdkPixbuf *stated;
GdkPixbuf *base_pixbuf; GdkPixbuf *base_pixbuf;
GtkStateFlags state;
gint width = 1; gint width = 1;
gint height = 1; gint height = 1;
cairo_t *cr; cairo_t *cr;
@ -1089,8 +1088,6 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context,
base_pixbuf = gtk_icon_source_get_pixbuf (source); base_pixbuf = gtk_icon_source_get_pixbuf (source);
G_GNUC_END_IGNORE_DEPRECATIONS; G_GNUC_END_IGNORE_DEPRECATIONS;
state = gtk_style_context_get_state (context);
g_return_val_if_fail (base_pixbuf != NULL, NULL); g_return_val_if_fail (base_pixbuf != NULL, NULL);
if (size != (GtkIconSize) -1 && if (size != (GtkIconSize) -1 &&
@ -1122,9 +1119,9 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context,
image_effect = _gtk_css_image_effect_value_get image_effect = _gtk_css_image_effect_value_get
(_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT)); (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT));
if (image_effect == GTK_CSS_IMAGE_EFFECT_DIM || switch (image_effect)
state & GTK_STATE_FLAG_INSENSITIVE)
{ {
case GTK_CSS_IMAGE_EFFECT_DIM:
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
gdk_pixbuf_get_width (scaled), gdk_pixbuf_get_width (scaled),
gdk_pixbuf_get_height (scaled)); gdk_pixbuf_get_height (scaled));
@ -1139,10 +1136,9 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context,
cairo_image_surface_get_width (surface), cairo_image_surface_get_width (surface),
cairo_image_surface_get_height (surface)); cairo_image_surface_get_height (surface));
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
} break;
else if (image_effect == GTK_CSS_IMAGE_EFFECT_HIGHLIGHT ||
state & GTK_STATE_FLAG_PRELIGHT) case GTK_CSS_IMAGE_EFFECT_HIGHLIGHT:
{
surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
gdk_pixbuf_get_width (scaled), gdk_pixbuf_get_width (scaled),
gdk_pixbuf_get_height (scaled)); gdk_pixbuf_get_height (scaled));
@ -1158,9 +1154,15 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context,
cairo_image_surface_get_width (surface), cairo_image_surface_get_width (surface),
cairo_image_surface_get_height (surface)); cairo_image_surface_get_height (surface));
cairo_surface_destroy (surface); cairo_surface_destroy (surface);
break;
default:
g_warn_if_reached ();
/* fall through */
case GTK_CSS_IMAGE_EFFECT_NONE:
stated = scaled;
break;
} }
else
stated = scaled;
return stated; return stated;
} }