diff options
| author | Benjamin Otte <otte@redhat.com> | 2014-10-27 00:25:18 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2015-01-07 14:26:47 +0100 |
| commit | 270e73bfcc7a1f22f123de0bbb52bf9e05c0d75a (patch) | |
| tree | 1965b9aac4d99beaa0e4571ac9301f05b7cfcfb1 /gtk/gtkcsslookup.c | |
| parent | c7e9489e3e9629c394ff3b3de7378bbf09ec92f0 (diff) | |
| download | gtk+-270e73bfcc7a1f22f123de0bbb52bf9e05c0d75a.tar.gz | |
stylecontext: Always pass the static style
... to build_properties.
There is always one available, so we can insist on that one.
This simplifies a bunch of code.
Diffstat (limited to 'gtk/gtkcsslookup.c')
| -rw-r--r-- | gtk/gtkcsslookup.c | 31 |
1 files changed, 9 insertions, 22 deletions
diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c index 0d0920f22e..c48223194d 100644 --- a/gtk/gtkcsslookup.c +++ b/gtk/gtkcsslookup.c @@ -19,8 +19,6 @@ #include "gtkcsslookupprivate.h" -#include "gtkcssanimatedstyleprivate.h" -#include "gtkcssstaticstyleprivate.h" #include "gtkcssstylepropertyprivate.h" #include "gtkcsstypesprivate.h" #include "gtkprivatetypebuiltins.h" @@ -108,14 +106,14 @@ void _gtk_css_lookup_resolve (GtkCssLookup *lookup, GtkStyleProviderPrivate *provider, int scale, - GtkCssStyle *style, + GtkCssStaticStyle *style, GtkCssStyle *parent_style) { guint i, n; g_return_if_fail (lookup != NULL); g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); - g_return_if_fail (GTK_IS_CSS_STYLE (style)); + g_return_if_fail (GTK_IS_CSS_STATIC_STYLE (style)); g_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style)); n = _gtk_css_style_property_get_n_properties (); @@ -124,24 +122,13 @@ _gtk_css_lookup_resolve (GtkCssLookup *lookup, { if (lookup->values[i].value || _gtk_bitmask_get (lookup->missing, i)) - { - if (GTK_IS_CSS_ANIMATED_STYLE (style)) - gtk_css_animated_style_compute_value (GTK_CSS_ANIMATED_STYLE (style), - provider, - scale, - parent_style, - i, - lookup->values[i].value, - lookup->values[i].section); - else - gtk_css_static_style_compute_value (GTK_CSS_STATIC_STYLE (style), - provider, - scale, - parent_style, - i, - lookup->values[i].value, - lookup->values[i].section); - } + gtk_css_static_style_compute_value (GTK_CSS_STATIC_STYLE (style), + provider, + scale, + parent_style, + i, + lookup->values[i].value, + lookup->values[i].section); /* else not a relevant property */ } } |