callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

css: Query icon theme from style, not from settings

Browse Source 
No need to look at the settings when the CSS has a property for the icon
theme.
This commit is contained in:
Benjamin Otte
2015-12-02 03:18:26 +01:00
parent d26a4b5555
commit bc1b53a34c
11 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkcssimageicontheme.c
View File

@ -23,6 +23,7 @@
#include <math.h>
#include "gtkcssiconthemevalueprivate.h"
#include "gtkcssrgbavalueprivate.h"
#include "gtksettingsprivate.h"
#include "gtkstyleproviderprivate.h"
@ -133,18 +134,10 @@ gtk_css_image_icon_theme_compute (GtkCssImage *image,
{
GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
GtkCssImageIconTheme *copy;
GtkSettings *settings;
GdkScreen *screen;
settings = _gtk_style_provider_private_get_settings (provider);
if (settings == NULL)
screen = gdk_screen_get_default ();
else
screen = _gtk_settings_get_screen (settings);
copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL);
copy->name = g_strdup (icon_theme->name);
copy->icon_theme = gtk_icon_theme_get_for_screen (screen);
copy->icon_theme = gtk_css_icon_theme_value_get_icon_theme (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_ICON_THEME));
copy->scale = _gtk_style_provider_private_get_scale (provider);
copy->color = *_gtk_css_rgba_value_get_rgba (gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR));