diff options
author | Benjamin Otte <otte@redhat.com> | 2012-08-30 15:51:29 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2012-09-03 12:54:14 +0200 |
commit | e3fc081c5dbb5ab04c8b0d3bd9aa52fe16aba640 (patch) | |
tree | 6b90497d19255d9e66bab89f480a9bc3c22d8736 /gtk/gtkcssshadowvalue.c | |
parent | fd7668bfb54674bda04cc74c2a6ad571939943e9 (diff) | |
download | gtk+-e3fc081c5dbb5ab04c8b0d3bd9aa52fe16aba640.tar.gz |
cssvalue: Pass property ID to transition function
This is to allow animating arrays properly. I'm not really thrilled
about this solution (we leak propertys into the values again...), but
it's the best I can come up with - I prefer it to having N different
array types...
Diffstat (limited to 'gtk/gtkcssshadowvalue.c')
-rw-r--r-- | gtk/gtkcssshadowvalue.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkcssshadowvalue.c b/gtk/gtkcssshadowvalue.c index bdfa8d25d4..ed311a17ef 100644 --- a/gtk/gtkcssshadowvalue.c +++ b/gtk/gtkcssshadowvalue.c @@ -106,17 +106,18 @@ gtk_css_value_shadow_equal (const GtkCssValue *shadow1, static GtkCssValue * gtk_css_value_shadow_transition (GtkCssValue *start, GtkCssValue *end, + guint property_id, double progress) { if (start->inset != end->inset) return NULL; - return gtk_css_shadow_value_new (_gtk_css_value_transition (start->hoffset, end->hoffset, progress), - _gtk_css_value_transition (start->voffset, end->voffset, progress), - _gtk_css_value_transition (start->radius, end->radius, progress), - _gtk_css_value_transition (start->spread, end->spread, progress), + return gtk_css_shadow_value_new (_gtk_css_value_transition (start->hoffset, end->hoffset, property_id, progress), + _gtk_css_value_transition (start->voffset, end->voffset, property_id, progress), + _gtk_css_value_transition (start->radius, end->radius, property_id, progress), + _gtk_css_value_transition (start->spread, end->spread, property_id, progress), start->inset, - _gtk_css_value_transition (start->color, end->color, progress)); + _gtk_css_value_transition (start->color, end->color, property_id, progress)); } static void |