From b65f87192973c6a13633af5700b893fc7594e695 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 29 Nov 2017 23:30:47 -0500 Subject: Use a texture instead of a pixbuf in gtk_render_icon This gets rid of more GdkPixbuf in the API. Update all callers. --- gtk/gtkrender.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gtk/gtkrender.c') diff --git a/gtk/gtkrender.c b/gtk/gtkrender.c index 39ffdf33b8..e898999f89 100644 --- a/gtk/gtkrender.c +++ b/gtk/gtkrender.c @@ -35,6 +35,7 @@ #include "gtkstylecontextprivate.h" #include "gsk/gskroundedrectprivate.h" +#include #include "fallback-c89.c" @@ -852,13 +853,13 @@ gtk_render_activity (GtkStyleContext *context, * gtk_render_icon: * @context: a #GtkStyleContext * @cr: a #cairo_t - * @pixbuf: a #GdkPixbuf containing the icon to draw + * @texture: a #GdkTexture containing the icon to draw * @x: X position for the @pixbuf * @y: Y position for the @pixbuf * - * Renders the icon in @pixbuf at the specified @x and @y coordinates. + * Renders the icon in @texture at the specified @x and @y coordinates. * - * This function will render the icon in @pixbuf at exactly its size, + * This function will render the icon in @texture at exactly its size, * regardless of scaling factors, which may not be appropriate when * drawing on displays with high pixel densities. * @@ -870,7 +871,7 @@ gtk_render_activity (GtkStyleContext *context, void gtk_render_icon (GtkStyleContext *context, cairo_t *cr, - GdkPixbuf *pixbuf, + GdkTexture *texture, gdouble x, gdouble y) { @@ -879,7 +880,7 @@ gtk_render_icon (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (cr != NULL); - surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, 1, NULL); + surface = gdk_texture_download_surface (texture); gtk_css_style_render_icon_surface (gtk_style_context_lookup_style (context), cr, -- cgit v1.2.1