From af2c40bd54149237cd4ab998b5515167018fdc47 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Thu, 27 Jun 2013 18:26:05 +0200 Subject: css: Add a scale argument to css-value compute vfunc We need to be able to compute different GtkCssImage values depending on the scale, and we need this at compute time so that we don't need to read any images other than the scale in used (to e.g. calculate the image size). GtkStyleProviderPrivate is shared for all style contexts, so its not right. --- gtk/gtkcsscolorvalue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gtk/gtkcsscolorvalue.c') diff --git a/gtk/gtkcsscolorvalue.c b/gtk/gtkcsscolorvalue.c index d523fe82d4..9972d96a99 100644 --- a/gtk/gtkcsscolorvalue.c +++ b/gtk/gtkcsscolorvalue.c @@ -101,6 +101,7 @@ gtk_css_value_color_free (GtkCssValue *color) static GtkCssValue * gtk_css_value_color_get_fallback (guint property_id, GtkStyleProviderPrivate *provider, + int scale, GtkCssComputedValues *values, GtkCssComputedValues *parent_values) { @@ -124,6 +125,7 @@ gtk_css_value_color_get_fallback (guint property_id, return _gtk_css_value_compute (_gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (property_id)), property_id, provider, + scale, values, parent_values, NULL); @@ -297,6 +299,7 @@ static GtkCssValue * gtk_css_value_color_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, + int scale, GtkCssComputedValues *values, GtkCssComputedValues *parent_values, GtkCssDependencies *dependencies) @@ -335,7 +338,7 @@ gtk_css_value_color_compute (GtkCssValue *value, NULL); if (resolved == NULL) - return gtk_css_value_color_get_fallback (property_id, provider, values, parent_values); + return gtk_css_value_color_get_fallback (property_id, provider, scale, values, parent_values); return resolved; } -- cgit v1.2.1