diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-12-02 03:18:26 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-12-02 03:18:26 +0100 |
| commit | bc1b53a34c8666404bb2220a8c89ff81d10a3026 (patch) | |
| tree | fe6918694968688f9a2c892ee340d5e234ed392a /gtk/gtkiconhelper.c | |
| parent | d26a4b55558e50d86639747e4819ada671375287 (diff) | |
| download | gtk+-bc1b53a34c8666404bb2220a8c89ff81d10a3026.tar.gz | |
css: Query icon theme from style, not from settings
No need to look at the settings when the CSS has a property for the icon
theme.
Diffstat (limited to 'gtk/gtkiconhelper.c')
| -rw-r--r-- | gtk/gtkiconhelper.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 25fec55db8..61bcc21178 100644 --- a/gtk/gtkiconhelper.c +++ b/gtk/gtkiconhelper.c @@ -24,6 +24,7 @@ #include <math.h> #include "gtkcssenumvalueprivate.h" +#include "gtkcssiconthemevalueprivate.h" #include "gtkrender.h" #include "gtkstylecontextprivate.h" #include "deprecated/gtkstock.h" @@ -457,7 +458,8 @@ ensure_surface_for_gicon (GtkIconHelper *self, GtkIconLookupFlags flags; cairo_surface_t *surface; - icon_theme = gtk_icon_theme_get_for_screen (gtk_style_context_get_screen (context)); + icon_theme = gtk_css_icon_theme_value_get_icon_theme + (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_ICON_THEME)); flags = get_icon_lookup_flags (self, context); ensure_icon_size (self, &width, &height); |