X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcsstypedvalue.c;h=aecee31d738d33a2bb0636874e4546f439f930ce;hb=e1edc998a2e9c557030d207533932b3120e13fe5;hp=eb98684d4071bf9730fcb123a6afdf505507ee76;hpb=9b4ed662181cabde506248cf8b344420a0300a3e;p=~andy%2Fgtk diff --git a/gtk/gtkcsstypedvalue.c b/gtk/gtkcsstypedvalue.c index eb98684d4..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,11 +35,16 @@ gtk_css_value_typed_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_typed_compute (GtkCssValue *value, - guint property_id, - 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 @@ -51,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;