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

iconhelper: Apply icon-effect directly

Browse Source 
Instead of creating an icon source, making sure no state is set and
therefore the icon-effect will be applied and then rendering that icon
source, just call the icon-effect apply function.

Also, the new way isn't deprecated.
This commit is contained in:
Benjamin Otte
2015-12-04 16:55:02 +01:00
parent 1b835fc7ce
commit 72d4b65b1d
1 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk/gtkiconhelper.c
View File

@ -161,32 +161,12 @@ ensure_stated_surface_from_pixbuf (GtkIconHelper *self,
gint scale, gint scale,
GdkWindow *window) GdkWindow *window)
{ {
GdkPixbuf *rendered;
GtkIconSource *source;
cairo_surface_t *surface; cairo_surface_t *surface;
GtkCssIconEffect icon_effect;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS; surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, window);
icon_effect = _gtk_css_icon_effect_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT));
/* FIXME: use gtk_icon_info_load_icon? */ gtk_css_icon_effect_apply (icon_effect, surface);
source = gtk_icon_source_new ();
gtk_icon_source_set_pixbuf (source, pixbuf);
/* The size here is arbitrary; since size isn't
* wildcarded in the source, it isn't supposed to be
* scaled by the engine function
*/
gtk_icon_source_set_size (source,
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_icon_source_set_size_wildcarded (source, FALSE);
rendered = gtk_render_icon_pixbuf (context, source, (GtkIconSize) -1);
gtk_icon_source_free (source);
G_GNUC_END_IGNORE_DEPRECATIONS;
surface = gdk_cairo_surface_create_from_pixbuf (rendered, scale, window);
g_object_unref (rendered);
return surface; return surface;
} }