Commit 270e73bf authored by Benjamin Otte's avatar Benjamin Otte

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.
parent c7e9489e
......@@ -126,24 +126,6 @@ gtk_css_animated_style_new (void)
return g_object_new (GTK_TYPE_CSS_ANIMATED_STYLE, NULL);
}
void
gtk_css_animated_style_compute_value (GtkCssAnimatedStyle *style,
GtkStyleProviderPrivate *provider,
int scale,
GtkCssStyle *parent_style,
guint id,
GtkCssValue *specified,
GtkCssSection *section)
{
gtk_internal_return_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style));
gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider));
gtk_internal_return_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style));
gtk_css_static_style_compute_value (GTK_CSS_STATIC_STYLE (style->style),
provider, scale, parent_style,
id, specified, section);
}
void
gtk_css_animated_style_set_animated_value (GtkCssAnimatedStyle *style,
guint id,
......
......@@ -54,13 +54,6 @@ GType gtk_css_animated_style_get_type (void) G_GNUC_CO
GtkCssStyle * gtk_css_animated_style_new (void);
void gtk_css_animated_style_compute_value (GtkCssAnimatedStyle *style,
GtkStyleProviderPrivate*provider,
int scale,
GtkCssStyle *parent_style,
guint id,
GtkCssValue *specified,
GtkCssSection *section);
void gtk_css_animated_style_set_animated_value(GtkCssAnimatedStyle *style,
guint id,
GtkCssValue *value);
......
......@@ -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 */
}
}
......@@ -20,7 +20,7 @@
#include <glib-object.h>
#include "gtk/gtkbitmaskprivate.h"
#include "gtk/gtkcssstyleprivate.h"
#include "gtk/gtkcssstaticstyleprivate.h"
#include "gtk/gtkcsssection.h"
......@@ -51,7 +51,7 @@ void _gtk_css_lookup_set (GtkCssLookup
void _gtk_css_lookup_resolve (GtkCssLookup *lookup,
GtkStyleProviderPrivate *provider,
int scale,
GtkCssStyle *style,
GtkCssStaticStyle *style,
GtkCssStyle *parent_style);
static inline const GtkBitmask *
......
......@@ -706,7 +706,7 @@ build_properties (GtkStyleContext *context,
_gtk_css_lookup_resolve (lookup,
GTK_STYLE_PROVIDER_PRIVATE (priv->cascade),
priv->scale,
style,
GTK_CSS_STATIC_STYLE (style),
priv->parent ? style_values_lookup (priv->parent) : NULL);
_gtk_css_lookup_free (lookup);
......@@ -739,19 +739,18 @@ style_values_lookup (GtkStyleContext *context)
if (gtk_style_context_is_saved (context))
{
<<<<<<< HEAD
values = gtk_css_static_style_new ();
g_hash_table_insert (priv->style_values,
gtk_css_node_declaration_ref (info->decl),
g_object_ref (values));
build_properties (context, values, info->decl, NULL, NULL);
}
else
{
values = gtk_css_animated_style_new ();
build_properties (context, values, info->decl, NULL, &priv->relevant_changes);
build_properties (context, GTK_CSS_ANIMATED_STYLE (values)->style, info->decl, NULL, &priv->relevant_changes);
/* These flags are always relevant */
priv->relevant_changes |= GTK_CSS_CHANGE_SOURCE;
}
......@@ -2838,7 +2837,7 @@ _gtk_style_context_validate (GtkStyleContext *context,
{
changes = gtk_css_style_compute_dependencies (current, parent_changes);
if (!_gtk_bitmask_is_empty (changes))
build_properties (context, current, info->decl, changes, NULL);
build_properties (context, GTK_CSS_ANIMATED_STYLE (current)->style, info->decl, changes, NULL);
gtk_style_context_update_cache (context, parent_changes);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment