Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

animations: Don't set animated values for finished transitions

Browse Source 
Otherwise, that value will never get reset and remain frozen in time.
This is problematic for example when the value is inherited and the
parent changes the value.
This commit is contained in:
Benjamin Otte
2012-10-05 18:45:37 +02:00
parent f9ddfa28b8
commit 55ade04e11
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkcsstransition.c
View File

@@ -38,9 +38,7 @@ gtk_css_transition_set_values (GtkStyleAnimation *animation,
if (transition->start_time >= for_time_us)
value = _gtk_css_value_ref (transition->start);
else if (transition->end_time <= for_time_us)
value = _gtk_css_value_ref (end);
else
else if (transition->end_time > for_time_us)
{
progress = (double) (for_time_us - transition->start_time) / (transition->end_time - transition->start_time);
progress = _gtk_css_ease_value_transform (transition->ease, progress);
@@ -52,9 +50,14 @@ gtk_css_transition_set_values (GtkStyleAnimation *animation,
if (value == NULL)
value = _gtk_css_value_ref (end);
}
else
value = NULL;
_gtk_css_computed_values_set_animated_value (values, transition->property, value);
_gtk_css_value_unref (value);
if (value)
{
_gtk_css_computed_values_set_animated_value (values, transition->property, value);
_gtk_css_value_unref (value);
}
}
static gboolean