X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcsstypedvalue.c;h=aecee31d738d33a2bb0636874e4546f439f930ce;hb=cf216d780cb2c889a3bcb5faa825fc1b21af8896;hp=81287a48e688866061051fd74730c144db06a032;hpb=9b953829fbf1332d00c2ca8a99c7da5e4bda8c64;p=~andy%2Fgtk diff --git a/gtk/gtkcsstypedvalue.c b/gtk/gtkcsstypedvalue.c index 81287a48e..aecee31d7 100644 --- a/gtk/gtkcsstypedvalue.c +++ b/gtk/gtkcsstypedvalue.c @@ -19,6 +19,7 @@ #include "gtkcsstypedvalueprivate.h" +#include "gtkcsscustompropertyprivate.h" #include "gtkcssstylefuncsprivate.h" struct _GtkCssValue { @@ -34,10 +35,16 @@ gtk_css_value_typed_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_typed_compute (GtkCssValue *value, - GtkStyleContext *context) +gtk_css_value_typed_compute (GtkCssValue *value, + guint property_id, + GtkStyleProviderPrivate *provider, + GtkCssComputedValues *values, + GtkCssComputedValues *parent_values, + GtkCssDependencies *dependencies) { - return _gtk_css_value_ref (value); + GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (_gtk_css_style_property_lookup_by_id (property_id)); + + return _gtk_css_style_compute_value (provider, values, parent_values, custom->pspec->value_type, value, dependencies); } static gboolean @@ -50,6 +57,7 @@ gtk_css_value_typed_equal (const GtkCssValue *value1, static GtkCssValue * gtk_css_value_typed_transition (GtkCssValue *start, GtkCssValue *end, + guint property_id, double progress) { return NULL;