diff options
author | Benjamin Otte <otte@redhat.com> | 2015-12-01 22:29:24 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2015-12-02 00:29:31 +0100 |
commit | 2396265523dfc65062cec89b7d971605ccb766ea (patch) | |
tree | 81eb77164a4606f40c7fd0ef8f1f72cad4c2e38e /gtk/gtkrender.c | |
parent | 7f93858cccbd33f1bae98f107d9665a91e0ec58d (diff) | |
download | gtk+-2396265523dfc65062cec89b7d971605ccb766ea.tar.gz |
css: Rename -gtk-image-effect to -gtk-icon-effect
This is a property for icons, so we should name it as such.
Diffstat (limited to 'gtk/gtkrender.c')
-rw-r--r-- | gtk/gtkrender.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c index c5468add0e..6339fd2314 100644 --- a/gtk/gtkrender.c +++ b/gtk/gtkrender.c @@ -1078,7 +1078,7 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context, cairo_t *cr; cairo_surface_t *surface; gboolean wildcarded; - GtkCssImageEffect image_effect; + GtkCssIconEffect image_effect; G_GNUC_BEGIN_IGNORE_DEPRECATIONS; base_pixbuf = gtk_icon_source_get_pixbuf (source); @@ -1112,12 +1112,12 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context, if (!wildcarded) return scaled; - image_effect = _gtk_css_image_effect_value_get + image_effect = _gtk_css_icon_effect_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_GTK_IMAGE_EFFECT)); switch (image_effect) { - case GTK_CSS_IMAGE_EFFECT_DIM: + case GTK_CSS_ICON_EFFECT_DIM: surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_pixbuf_get_width (scaled), gdk_pixbuf_get_height (scaled)); @@ -1134,7 +1134,7 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context, cairo_surface_destroy (surface); break; - case GTK_CSS_IMAGE_EFFECT_HIGHLIGHT: + case GTK_CSS_ICON_EFFECT_HIGHLIGHT: surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, gdk_pixbuf_get_width (scaled), gdk_pixbuf_get_height (scaled)); @@ -1155,7 +1155,7 @@ gtk_do_render_icon_pixbuf (GtkStyleContext *context, default: g_warn_if_reached (); /* fall through */ - case GTK_CSS_IMAGE_EFFECT_NONE: + case GTK_CSS_ICON_EFFECT_NONE: stated = scaled; break; } |