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

icon helper: Avoid gratitious pixbuf use

Browse Source 
We can just get the texture directly from the icontheme.
This commit is contained in:
Matthias Clasen 2017-11-30 17:31:17 -05:00
parent 029165638b
commit a1c0b81bae
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk/gtkiconhelper.c
View File

@ -281,7 +281,6 @@ ensure_texture_for_gicon (GtkIconHelper *self,
GtkIconInfo *info;
GtkIconLookupFlags flags;
GdkTexture *texture;
GdkPixbuf *destination;
icon_theme = gtk_css_icon_theme_value_get_icon_theme
(gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME));
@ -293,34 +292,14 @@ ensure_texture_for_gicon (GtkIconHelper *self,
gicon,
MIN (width, height),
scale, flags);
if (info)
{
*symbolic = gtk_icon_info_is_symbolic (info);
if (info == NULL)
info = gtk_icon_theme_lookup_icon (icon_theme,
"image-missing",
width,
flags | GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_GENERIC_FALLBACK);
destination = gtk_icon_info_load_icon (info, NULL);
}
else
{
destination = NULL;
}
if (destination == NULL)
{
GError *error = NULL;
destination = gtk_icon_theme_load_icon (icon_theme,
"image-missing",
width,
flags | GTK_ICON_LOOKUP_USE_BUILTIN | GTK_ICON_LOOKUP_GENERIC_FALLBACK,
&error);
/* We include this image as resource, so we always have it available or
* the icontheme code is broken */
g_assert_no_error (error);
g_assert (destination);
*symbolic = FALSE;
}
texture = gdk_texture_new_for_pixbuf (destination);
g_object_unref (destination);
*symbolic = gtk_icon_info_is_symbolic (info);
texture = gtk_icon_info_load_texture (info);
return texture;
}