AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

iconhelper: Un-duplicate some code

Browse Source
This commit is contained in:
Timm Bäder 2016-02-06 09:27:00 +01:00
parent c360b5fb49
commit 2902063f24
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkiconhelper.c
View File

@ -478,18 +478,15 @@ ensure_surface_for_gicon (GtkIconHelper *self,
symbolic = FALSE; symbolic = FALSE;
} }
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
if (!symbolic) if (!symbolic)
{ {
GtkCssIconEffect icon_effect; GtkCssIconEffect icon_effect;
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT)); icon_effect = _gtk_css_icon_effect_value_get (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_EFFECT));
gtk_css_icon_effect_apply (icon_effect, surface); gtk_css_icon_effect_apply (icon_effect, surface);
} }
else
{
surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window (gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
}
g_object_unref (destination); g_object_unref (destination);
return surface; return surface;