{
GtkCssAnimatedValues *values = GTK_CSS_ANIMATED_VALUES (object);
- g_clear_object (&values->computed);
g_slist_free_full (values->animations, g_object_unref);
values->animations = NULL;
GtkCssComputedValues *source)
{
TransitionInfo transitions[GTK_CSS_PROPERTY_N_PROPERTIES] = { { 0, } };
- GtkCssComputedValues *source_computed, *computed;
+ GtkCssComputedValues *computed;
GtkCssValue *durations, *delays, *timing_functions;
guint i;
computed = GTK_CSS_COMPUTED_VALUES (values);
- if (GTK_IS_CSS_ANIMATED_VALUES (source))
- source_computed = GTK_CSS_ANIMATED_VALUES (source)->computed;
- else
- source_computed = source;
transition_infos_set (transitions, _gtk_css_computed_values_get_value (computed, GTK_CSS_PROPERTY_TRANSITION_PROPERTY));
if (duration + delay == 0.0)
continue;
- start = _gtk_css_computed_values_get_value (source_computed, i);
- end = _gtk_css_computed_values_get_value (values->computed, i);
+ start = _gtk_css_computed_values_get_intrinsic_value (source, i);
+ end = _gtk_css_computed_values_get_intrinsic_value (computed, i);
if (_gtk_css_value_equal (start, end))
{
if (GTK_IS_CSS_ANIMATED_VALUES (source))
values = g_object_new (GTK_TYPE_CSS_ANIMATED_VALUES, NULL);
- values->computed = g_object_ref (computed);
for (i = 0; ; i++)
{
value = _gtk_css_computed_values_get_value (computed, i);
_gtk_css_animated_values_advance (GtkCssAnimatedValues *values,
gint64 timestamp)
{
+ GtkCssComputedValues *computed;
GtkBitmask *changed;
+ GPtrArray *old_animated_values;
GSList *list;
g_return_val_if_fail (GTK_IS_CSS_ANIMATED_VALUES (values), NULL);
g_return_val_if_fail (timestamp >= values->current_time, NULL);
+ computed = GTK_CSS_COMPUTED_VALUES (values);
changed = _gtk_bitmask_new ();
values->current_time = timestamp;
+ old_animated_values = computed->animated_values;
+ computed->animated_values = NULL;
list = values->animations;
while (list)
}
}
+ if (old_animated_values)
+ g_ptr_array_unref (old_animated_values);
+
return changed;
}
value = _gtk_css_keyframes_get_value (animation->keyframes,
i,
progress,
- _gtk_css_computed_values_get_value (values, i));
- /* XXX: Is using 0 correct here? */
- _gtk_css_computed_values_set_value (values, property_id, value, 0, NULL);
+ _gtk_css_computed_values_get_intrinsic_value (values, i));
+ _gtk_css_computed_values_set_animated_value (values, property_id, value);
_gtk_css_value_unref (value);
changed = _gtk_bitmask_set (changed, property_id, TRUE);
value = _gtk_css_value_ref (transition->end);
}
- /* XXX: Is using 0 correct here? */
- _gtk_css_computed_values_set_value (values, transition->property, value, 0, NULL);
+ _gtk_css_computed_values_set_animated_value (values, transition->property, value);
_gtk_css_value_unref (value);
return _gtk_bitmask_set (changed, transition->property, TRUE);