Commit d14e2a48 authored by Benjamin Otte's avatar Benjamin Otte
Browse files

iconhelper: Fold function into callers

The function takes so many arguments and is so short that it's not worth
keeping.
parent 72d4b65b
...@@ -154,23 +154,6 @@ ensure_icon_size (GtkIconHelper *self, ...@@ -154,23 +154,6 @@ ensure_icon_size (GtkIconHelper *self,
*height_out = height; *height_out = height;
} }
static cairo_surface_t *
ensure_stated_surface_from_pixbuf (GtkIconHelper *self,
GtkStyleContext *context,
GdkPixbuf *pixbuf,
gint scale,
GdkWindow *window)
{
cairo_surface_t *surface;
GtkCssIconEffect icon_effect;
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));
gtk_css_icon_effect_apply (icon_effect, surface);
return surface;
}
static GtkIconLookupFlags static GtkIconLookupFlags
get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context) get_icon_lookup_flags (GtkIconHelper *self, GtkStyleContext *context)
{ {
...@@ -344,6 +327,7 @@ ensure_surface_from_pixbuf (GtkIconHelper *self, ...@@ -344,6 +327,7 @@ ensure_surface_from_pixbuf (GtkIconHelper *self,
gint width, height; gint width, height;
cairo_surface_t *surface; cairo_surface_t *surface;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
GtkCssIconEffect icon_effect;
if (get_pixbuf_size (self, if (get_pixbuf_size (self,
context, context,
...@@ -357,7 +341,9 @@ ensure_surface_from_pixbuf (GtkIconHelper *self, ...@@ -357,7 +341,9 @@ ensure_surface_from_pixbuf (GtkIconHelper *self,
else else
pixbuf = g_object_ref (orig_pixbuf); pixbuf = g_object_ref (orig_pixbuf);
surface = ensure_stated_surface_from_pixbuf (self, context, pixbuf, scale, self->priv->window); surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, self->priv->window);
icon_effect = _gtk_css_icon_effect_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT));
gtk_css_icon_effect_apply (icon_effect, surface);
g_object_unref (pixbuf); g_object_unref (pixbuf);
return surface; return surface;
...@@ -429,9 +415,17 @@ ensure_surface_for_gicon (GtkIconHelper *self, ...@@ -429,9 +415,17 @@ ensure_surface_for_gicon (GtkIconHelper *self,
} }
if (!symbolic) if (!symbolic)
surface = ensure_stated_surface_from_pixbuf (self, context, destination, scale, self->priv->window); {
GtkCssIconEffect icon_effect;
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, self->priv->window);
icon_effect = _gtk_css_icon_effect_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_EFFECT));
gtk_css_icon_effect_apply (icon_effect, surface);
}
else else
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, self->priv->window); {
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, self->priv->window);
}
g_object_unref (destination); g_object_unref (destination);
return surface; return surface;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment