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/gtkcssstaticstyle.c | |
| parent | 808bfe0a98ac4cd2e11ea4eed82a66470121c19b (diff) | |
| download | gtk+-1116914ea03685ffbff188e48e32685a4985c2d3.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/gtkcssstaticstyle.c')
| -rw-r--r-- | gtk/gtkcssstaticstyle.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gtk/gtkcssstaticstyle.c b/gtk/gtkcssstaticstyle.c index a127b69968..9b0e3d457f 100644 --- a/gtk/gtkcssstaticstyle.c +++ b/gtk/gtkcssstaticstyle.c @@ -198,7 +198,6 @@ gtk_css_static_style_get_default (void) result = gtk_css_static_style_new_compute (GTK_STYLE_PROVIDER_PRIVATE (settings), NULL, - 1, NULL); g_object_set_qdata_full (G_OBJECT (settings), style_quark, result, g_object_unref); @@ -208,7 +207,6 @@ gtk_css_static_style_get_default (void) GtkCssStyle * gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider, const GtkCssMatcher *matcher, - int scale, GtkCssStyle *parent) { GtkCssStaticStyle *result; @@ -229,7 +227,6 @@ gtk_css_static_style_new_compute (GtkStyleProviderPrivate *provider, _gtk_css_lookup_resolve (lookup, provider, - scale, result, parent); @@ -243,7 +240,6 @@ gtk_css_static_style_new_update (GtkCssStaticStyle *style, const GtkBitmask *parent_changes, GtkStyleProviderPrivate *provider, const GtkCssMatcher *matcher, - int scale, GtkCssStyle *parent) { GtkCssStaticStyle *result; @@ -295,7 +291,6 @@ gtk_css_static_style_new_update (GtkCssStaticStyle *style, _gtk_css_lookup_resolve (lookup, provider, - scale, result, parent); @@ -308,7 +303,6 @@ gtk_css_static_style_new_update (GtkCssStaticStyle *style, void gtk_css_static_style_compute_value (GtkCssStaticStyle *style, GtkStyleProviderPrivate *provider, - int scale, GtkCssStyle *parent_style, guint id, GtkCssValue *specified, @@ -338,7 +332,7 @@ gtk_css_static_style_compute_value (GtkCssStaticStyle *style, else _gtk_css_value_ref (specified); - value = _gtk_css_value_compute (specified, id, provider, scale, GTK_CSS_STYLE (style), parent_style, &dependencies); + value = _gtk_css_value_compute (specified, id, provider, GTK_CSS_STYLE (style), parent_style, &dependencies); gtk_css_static_style_set_value (style, id, value, section); |