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

GtkIconHelper use GtkIconInfo as paintable

Browse Source
This commit is contained in:
Alexander Larsson 2020-01-27 14:05:00 +01:00
parent b96ab7453b
commit aefd8443de
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkiconhelper.c
View File

@ -104,7 +104,6 @@ ensure_paintable_for_gicon (GtkIconHelper *self,
gint width, height;
GtkIconInfo *info;
GtkIconLookupFlags flags;
GdkPaintable *paintable;
icon_theme = gtk_css_icon_theme_value_get_icon_theme (style->core->icon_theme);
flags = get_icon_lookup_flags (self, style, dir);
@ -122,18 +121,7 @@ ensure_paintable_for_gicon (GtkIconHelper *self,
flags | GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
*symbolic = gtk_icon_info_is_symbolic (info);
paintable = gtk_icon_info_load_icon (info, NULL);
g_object_unref (info);
if (paintable && scale != 1)
{
GdkPaintable *orig = paintable;
paintable = gtk_scaler_new (orig, scale);
g_object_unref (orig);
}
return paintable;
return GDK_PAINTABLE (info);
}
static GdkPaintable *