diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-11-25 02:28:59 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-11-25 02:45:10 +0100 |
| commit | 42dc0ea0fd423f3794d1f77bb9bb84d5bc9d3c0e (patch) | |
| tree | 90c183370b1dca8f1b54222593bf005dd88a7dff /gtk/gtkstylecontext.c | |
| parent | 08ac1504d2c99d8bfd8ba3fb384f09263dcc66e5 (diff) | |
| download | gtk+-42dc0ea0fd423f3794d1f77bb9bb84d5bc9d3c0e.tar.gz | |
styleprovider: Change function prototype
Make _gtk_style_provider_private_get_color() return a GtkCssValue (a
GtkCssColorValue to be exact) instead of GtkSymbolicColor.
With this, the symbolic color usage inside GTK is minimized.
Diffstat (limited to 'gtk/gtkstylecontext.c')
| -rw-r--r-- | gtk/gtkstylecontext.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index ef7ecfdf43..b74163ea15 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -2298,7 +2298,7 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context, else g_value_init (&pcache->value, GDK_TYPE_COLOR); - if (_gtk_style_context_resolve_color (context, color, &rgba, NULL)) + if (_gtk_style_context_resolve_color (context, _gtk_symbolic_color_get_css_value (color), &rgba, NULL)) { if (G_PARAM_SPEC_VALUE_TYPE (pspec) == GDK_TYPE_RGBA) g_value_set_boxed (&pcache->value, &rgba); @@ -2704,7 +2704,7 @@ gtk_style_context_get_junction_sides (GtkStyleContext *context) gboolean _gtk_style_context_resolve_color (GtkStyleContext *context, - GtkSymbolicColor *color, + GtkCssValue *color, GdkRGBA *result, GtkCssDependencies *dependencies) { @@ -2714,7 +2714,7 @@ _gtk_style_context_resolve_color (GtkStyleContext *context, g_return_val_if_fail (color != NULL, FALSE); g_return_val_if_fail (result != NULL, FALSE); - val = _gtk_css_color_value_resolve (_gtk_symbolic_color_get_css_value (color), + val = _gtk_css_color_value_resolve (color, GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade), _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR), GTK_CSS_DEPENDS_ON_COLOR, @@ -2742,17 +2742,17 @@ gtk_style_context_lookup_color (GtkStyleContext *context, const gchar *color_name, GdkRGBA *color) { - GtkSymbolicColor *sym_color; + GtkCssValue *value; g_return_val_if_fail (GTK_IS_STYLE_CONTEXT (context), FALSE); g_return_val_if_fail (color_name != NULL, FALSE); g_return_val_if_fail (color != NULL, FALSE); - sym_color = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade), color_name); - if (sym_color == NULL) + value = _gtk_style_provider_private_get_color (GTK_STYLE_PROVIDER_PRIVATE (context->priv->cascade), color_name); + if (value == NULL) return FALSE; - return _gtk_style_context_resolve_color (context, sym_color, color, NULL); + return _gtk_style_context_resolve_color (context, value, color, NULL); } /** |