diff options
Diffstat (limited to 'gtk/gtkcssstylefuncs.c')
| -rw-r--r-- | gtk/gtkcssstylefuncs.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gtk/gtkcssstylefuncs.c b/gtk/gtkcssstylefuncs.c index 50ad34a108..b19a3e60c0 100644 --- a/gtk/gtkcssstylefuncs.c +++ b/gtk/gtkcssstylefuncs.c @@ -27,6 +27,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <cairo-gobject.h> +#include "gtkcsscolorvalueprivate.h" #include "gtkcssimagegradientprivate.h" #include "gtkcssprovider.h" #include "gtkcssrgbavalueprivate.h" @@ -225,11 +226,11 @@ rgba_value_compute (GtkStyleProviderPrivate *provider, GValue new_value = G_VALUE_INIT; GdkRGBA rgba; - val = _gtk_symbolic_color_resolve_full (symbolic, - provider, - _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR), - GTK_CSS_DEPENDS_ON_COLOR, - dependencies); + val = _gtk_css_color_value_resolve (_gtk_symbolic_color_get_css_value (symbolic), + provider, + _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR), + GTK_CSS_DEPENDS_ON_COLOR, + dependencies); if (val != NULL) { rgba = *_gtk_css_rgba_value_get_rgba (val); @@ -310,11 +311,11 @@ color_value_compute (GtkStyleProviderPrivate *provider, GValue new_value = G_VALUE_INIT; GtkCssValue *val; - val = _gtk_symbolic_color_resolve_full ((GtkSymbolicColor *) g_value_get_boxed (value), - provider, - _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR), - GTK_CSS_DEPENDS_ON_COLOR, - dependencies); + val = _gtk_css_color_value_resolve (_gtk_symbolic_color_get_css_value (g_value_get_boxed (value)), + provider, + _gtk_css_computed_values_get_value (values, GTK_CSS_PROPERTY_COLOR), + GTK_CSS_DEPENDS_ON_COLOR, + dependencies); if (val != NULL) { const GdkRGBA *rgba = _gtk_css_rgba_value_get_rgba (val); |