X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkcsscornervalue.c;h=394675c71a08812a1f763bbfc10a01762cb8e214;hb=56bcb1933f6de613e5d8689e23420d47b65425c3;hp=7e41688950e71500e625a228c1af2aed41f62bac;hpb=9b4ed662181cabde506248cf8b344420a0300a3e;p=~andy%2Fgtk diff --git a/gtk/gtkcsscornervalue.c b/gtk/gtkcsscornervalue.c index 7e4168895..394675c71 100644 --- a/gtk/gtkcsscornervalue.c +++ b/gtk/gtkcsscornervalue.c @@ -37,14 +37,19 @@ gtk_css_value_corner_free (GtkCssValue *value) } static GtkCssValue * -gtk_css_value_corner_compute (GtkCssValue *corner, - guint property_id, - GtkStyleContext *context) +gtk_css_value_corner_compute (GtkCssValue *corner, + guint property_id, + GtkStyleProviderPrivate *provider, + GtkCssComputedValues *values, + GtkCssComputedValues *parent_values, + GtkCssDependencies *dependencies) { GtkCssValue *x, *y; + GtkCssDependencies x_deps, y_deps; - x = _gtk_css_value_compute (corner->x, property_id, context); - y = _gtk_css_value_compute (corner->y, property_id, context); + x = _gtk_css_value_compute (corner->x, property_id, provider, values, parent_values, &x_deps); + y = _gtk_css_value_compute (corner->y, property_id, provider, values, parent_values, &y_deps); + *dependencies = _gtk_css_dependencies_union (x_deps, y_deps); if (x == corner->x && y == corner->y) { _gtk_css_value_unref (x); @@ -65,15 +70,16 @@ gtk_css_value_corner_equal (const GtkCssValue *corner1, static GtkCssValue * gtk_css_value_corner_transition (GtkCssValue *start, - GtkCssValue *end, - double progress) + GtkCssValue *end, + guint property_id, + double progress) { GtkCssValue *x, *y; - x = _gtk_css_value_transition (start->x, end->x, progress); + x = _gtk_css_value_transition (start->x, end->x, property_id, progress); if (x == NULL) return NULL; - y = _gtk_css_value_transition (start->y, end->y, progress); + y = _gtk_css_value_transition (start->y, end->y, property_id, progress); if (y == NULL) { _gtk_css_value_unref (x);