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/gtkfilechooserbutton.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/gtkfilechooserbutton.c')
| -rw-r--r-- | gtk/gtkfilechooserbutton.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c index 000482ebf8..8ac5b9e36d 100644 --- a/gtk/gtkfilechooserbutton.c +++ b/gtk/gtkfilechooserbutton.c @@ -34,6 +34,7 @@ #include "gtkcellrenderertext.h" #include "gtkcellrendererpixbuf.h" #include "gtkcombobox.h" +#include "gtkcssiconthemevalueprivate.h" #include "gtkdnd.h" #include "gtkicontheme.h" #include "deprecated/gtkiconfactory.h" @@ -1489,10 +1490,8 @@ gtk_file_chooser_button_screen_changed (GtkWidget *widget, static GtkIconTheme * get_icon_theme (GtkWidget *widget) { - if (gtk_widget_has_screen (widget)) - return gtk_icon_theme_get_for_screen (gtk_widget_get_screen (widget)); - - return gtk_icon_theme_get_default (); + return gtk_css_icon_theme_value_get_icon_theme + (_gtk_style_context_peek_property (gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_ICON_THEME)); } @@ -1963,7 +1962,7 @@ model_add_bookmarks (GtkFileChooserButton *button, if (!label) label = _gtk_file_chooser_label_for_file (file); - icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button))); + icon_theme = get_icon_theme (GTK_WIDGET (button)); surface = gtk_icon_theme_load_surface (icon_theme, "folder-remote", button->priv->icon_size, gtk_widget_get_scale_factor (GTK_WIDGET (button)), @@ -2070,7 +2069,7 @@ model_update_current_folder (GtkFileChooserButton *button, if (!label) label = _gtk_file_chooser_label_for_file (file); - icon_theme = gtk_icon_theme_get_for_screen (gtk_widget_get_screen (GTK_WIDGET (button))); + icon_theme = get_icon_theme (GTK_WIDGET (button)); if (g_file_is_native (file)) surface = gtk_icon_theme_load_surface (icon_theme, "folder", |