diff options
| author | Benjamin Otte <otte@redhat.com> | 2015-01-31 11:56:15 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-02-06 11:26:31 +0100 |
| commit | 1116914ea03685ffbff188e48e32685a4985c2d3 (patch) | |
| tree | 13ba596816f999356a705ce410e588e7dfef56c4 /gtk/gtkcssinitialvalue.c | |
| parent | 808bfe0a98ac4cd2e11ea4eed82a66470121c19b (diff) | |
| download | gtk+-wip/mir2.tar.gz | |
css: Move scale to GtkStyleProviderPrivatewip/mir2
This way, we can remove it as a separate argument from
gtk_css_value_compute() and allow computation to only depend on one
thing: the style provider.
Diffstat (limited to 'gtk/gtkcssinitialvalue.c')
| -rw-r--r-- | gtk/gtkcssinitialvalue.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk/gtkcssinitialvalue.c b/gtk/gtkcssinitialvalue.c index 0a16cb940c..5b1be1019c 100644 --- a/gtk/gtkcssinitialvalue.c +++ b/gtk/gtkcssinitialvalue.c @@ -41,9 +41,8 @@ static GtkCssValue * gtk_css_value_initial_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, - int scale, - GtkCssStyle *values, - GtkCssStyle *parent_values, + GtkCssStyle *style, + GtkCssStyle *parent_style, GtkCssDependencies *dependencies) { GtkSettings *settings; @@ -94,9 +93,8 @@ gtk_css_value_initial_compute (GtkCssValue *value, 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, + style, + parent_style, dependencies); } |