diff options
| author | Timm Bäder <mail@baedert.org> | 2020-01-09 10:22:53 +0100 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-01-10 14:06:55 -0500 |
| commit | c5e1c97ca475faf4475c58e29784364254bcbeae (patch) | |
| tree | 1a84cfbfecbbef2d6ba1be916457d46ddc42bdc1 | |
| parent | 7d99339c394f27daf5a43fe9156cfd32f7219171 (diff) | |
| download | gtk+-c5e1c97ca475faf4475c58e29784364254bcbeae.tar.gz | |
csscolorvalue: Don't resolve literal color values
| -rw-r--r-- | gtk/gtkcsscolorvalue.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index dbb63ae780..b8cd6c1dab 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -136,7 +136,7 @@ gtk_css_value_color_compute (GtkCssValue *value, GtkCssStyle *style, GtkCssStyle *parent_style) { - GtkCssValue *resolved, *current; + GtkCssValue *resolved; /* The computed value of the ‘currentColor’ keyword is the computed * value of the ‘color’ property. If the ‘currentColor’ keyword is @@ -144,20 +144,31 @@ gtk_css_value_color_compute (GtkCssValue *value, */ if (property_id == GTK_CSS_PROPERTY_COLOR) { + GtkCssValue *current; + if (parent_style) current = gtk_css_style_get_value (parent_style, GTK_CSS_PROPERTY_COLOR); else current = NULL; + + resolved = _gtk_css_color_value_resolve (value, + provider, + current, + NULL); + } + else if (value->type == COLOR_TYPE_LITERAL) + { + resolved = _gtk_css_value_ref (value->last_value); } else { - current = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR); + GtkCssValue *current = gtk_css_style_get_value (style, GTK_CSS_PROPERTY_COLOR); + + resolved = _gtk_css_color_value_resolve (value, + provider, + current, + NULL); } - - resolved = _gtk_css_color_value_resolve (value, - provider, - current, - NULL); if (resolved == NULL) return gtk_css_value_color_get_fallback (property_id, provider, style, parent_style); |