From 0ec4c76d8f54a7e2127cafb1ba8c4bbe68fd30fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 5 Feb 2016 09:28:11 +0100 Subject: [PATCH] stylepropertyimpl: Use GTK_CSS_AFFECTS_SYMBOLIC_ICON Things like color affect symbolic icons, but not colored icons, while other css properties like -gtk-icon-effect affect colored icons, but not symbolic ones. --- gtk/gtkcssstylepropertyimpl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gtk/gtkcssstylepropertyimpl.c b/gtk/gtkcssstylepropertyimpl.c index 96166ae637..6cd36c8da7 100644 --- a/gtk/gtkcssstylepropertyimpl.c +++ b/gtk/gtkcssstylepropertyimpl.c @@ -1029,7 +1029,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_COLOR, GDK_TYPE_RGBA, GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_FOREGROUND | GTK_CSS_AFFECTS_TEXT | GTK_CSS_AFFECTS_ICON, + GTK_CSS_AFFECTS_FOREGROUND | GTK_CSS_AFFECTS_TEXT | GTK_CSS_AFFECTS_SYMBOLIC_ICON, color_parse, color_query, color_assign, @@ -1056,7 +1056,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_THEME, G_TYPE_NONE, GTK_STYLE_PROPERTY_INHERIT, - GTK_CSS_AFFECTS_ICON, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON, icon_theme_value_parse, NULL, NULL, @@ -1065,7 +1065,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_PALETTE, G_TYPE_NONE, GTK_STYLE_PROPERTY_ANIMATED | GTK_STYLE_PROPERTY_INHERIT, - GTK_CSS_AFFECTS_ICON, + GTK_CSS_AFFECTS_SYMBOLIC_ICON, icon_palette_parse, NULL, NULL, @@ -1603,7 +1603,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_SOURCE, G_TYPE_NONE, GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON, css_image_value_parse_with_builtin, NULL, NULL, @@ -1612,7 +1612,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_SHADOW, G_TYPE_NONE, GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON | GTK_CSS_AFFECTS_CLIP, shadow_value_parse, NULL, NULL, @@ -1622,7 +1622,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_STYLE, G_TYPE_NONE, GTK_STYLE_PROPERTY_INHERIT, - GTK_CSS_AFFECTS_ICON, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON, icon_style_parse, NULL, NULL, @@ -1631,7 +1631,7 @@ _gtk_css_style_property_init_properties (void) GTK_CSS_PROPERTY_ICON_TRANSFORM, G_TYPE_NONE, GTK_STYLE_PROPERTY_ANIMATED, - GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_CLIP, + GTK_CSS_AFFECTS_ICON | GTK_CSS_AFFECTS_SYMBOLIC_ICON | GTK_CSS_AFFECTS_CLIP, transform_value_parse, NULL, NULL,