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/gtkcssenumvalue.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/gtkcssenumvalue.c')
| -rw-r--r-- | gtk/gtkcssenumvalue.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gtk/gtkcssenumvalue.c b/gtk/gtkcssenumvalue.c index 15140520ef..49833df092 100644 --- a/gtk/gtkcssenumvalue.c +++ b/gtk/gtkcssenumvalue.c @@ -41,9 +41,8 @@ static GtkCssValue * gtk_css_value_enum_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, - int scale, - GtkCssStyle *values, - GtkCssStyle *parent_values, + GtkCssStyle *style, + GtkCssStyle *parent_style, GtkCssDependencies *dependencies) { return _gtk_css_value_ref (value); @@ -165,9 +164,8 @@ static GtkCssValue * gtk_css_value_font_size_compute (GtkCssValue *value, guint property_id, GtkStyleProviderPrivate *provider, - int scale, - GtkCssStyle *values, - GtkCssStyle *parent_values, + GtkCssStyle *style, + GtkCssStyle *parent_style, GtkCssDependencies *dependencies) { double font_size; @@ -200,8 +198,8 @@ gtk_css_value_font_size_compute (GtkCssValue *value, break; case GTK_CSS_FONT_SIZE_SMALLER: *dependencies = GTK_CSS_DEPENDS_ON_PARENT; - if (parent_values) - font_size = _gtk_css_number_value_get (gtk_css_style_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100); + if (parent_style) + font_size = _gtk_css_number_value_get (gtk_css_style_get_value (parent_style, GTK_CSS_PROPERTY_FONT_SIZE), 100); else font_size = _gtk_css_font_size_get_default (provider); /* XXX: This is what WebKit does... */ @@ -209,8 +207,8 @@ gtk_css_value_font_size_compute (GtkCssValue *value, break; case GTK_CSS_FONT_SIZE_LARGER: *dependencies = GTK_CSS_DEPENDS_ON_PARENT; - if (parent_values) - font_size = _gtk_css_number_value_get (gtk_css_style_get_value (parent_values, GTK_CSS_PROPERTY_FONT_SIZE), 100); + if (parent_style) + font_size = _gtk_css_number_value_get (gtk_css_style_get_value (parent_style, GTK_CSS_PROPERTY_FONT_SIZE), 100); else font_size = _gtk_css_font_size_get_default (provider); /* XXX: This is what WebKit does... */ |