callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

csscomputedvalues: Store animated values here

Browse Source 
Actually use the GtkCssComputedValues to store the computed values here
instead of putting them into the GtkCssAnimatedValues separately.
This commit is contained in:
Benjamin Otte
2012-09-13 16:23:36 +02:00
parent 94a3bd21e5
commit 7248c19037
4 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtkcssanimatedvalues.c
View File

@ -41,7 +41,6 @@ gtk_css_animated_values_dispose (GObject *object)
{ {
GtkCssAnimatedValues *values = GTK_CSS_ANIMATED_VALUES (object); GtkCssAnimatedValues *values = GTK_CSS_ANIMATED_VALUES (object);
g_clear_object (&values->computed);
g_slist_free_full (values->animations, g_object_unref); g_slist_free_full (values->animations, g_object_unref);
values->animations = NULL; values->animations = NULL;
@ -164,15 +163,11 @@ gtk_css_animated_values_start_transitions (GtkCssAnimatedValues *values,
GtkCssComputedValues *source) GtkCssComputedValues *source)
{ {
TransitionInfo transitions[GTK_CSS_PROPERTY_N_PROPERTIES] = { { 0, } }; TransitionInfo transitions[GTK_CSS_PROPERTY_N_PROPERTIES] = { { 0, } };
GtkCssComputedValues *source_computed, *computed; GtkCssComputedValues *computed;
GtkCssValue *durations, *delays, *timing_functions; GtkCssValue *durations, *delays, *timing_functions;
guint i; guint i;
computed = GTK_CSS_COMPUTED_VALUES (values); 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)); transition_infos_set (transitions, _gtk_css_computed_values_get_value (computed, GTK_CSS_PROPERTY_TRANSITION_PROPERTY));
@ -194,8 +189,8 @@ gtk_css_animated_values_start_transitions (GtkCssAnimatedValues *values,
if (duration + delay == 0.0) if (duration + delay == 0.0)
continue; continue;
start = _gtk_css_computed_values_get_value (source_computed, i); start = _gtk_css_computed_values_get_intrinsic_value (source, i);
end = _gtk_css_computed_values_get_value (values->computed, i); end = _gtk_css_computed_values_get_intrinsic_value (computed, i);
if (_gtk_css_value_equal (start, end)) if (_gtk_css_value_equal (start, end))
{ {
if (GTK_IS_CSS_ANIMATED_VALUES (source)) if (GTK_IS_CSS_ANIMATED_VALUES (source))
@ -321,7 +316,6 @@ _gtk_css_animated_values_new (GtkCssComputedValues *computed,
values = g_object_new (GTK_TYPE_CSS_ANIMATED_VALUES, NULL); values = g_object_new (GTK_TYPE_CSS_ANIMATED_VALUES, NULL);
values->computed = g_object_ref (computed);
for (i = 0; ; i++) for (i = 0; ; i++)
{ {
value = _gtk_css_computed_values_get_value (computed, i); value = _gtk_css_computed_values_get_value (computed, i);
@ -357,15 +351,20 @@ GtkBitmask *
_gtk_css_animated_values_advance (GtkCssAnimatedValues *values, _gtk_css_animated_values_advance (GtkCssAnimatedValues *values,
gint64 timestamp) gint64 timestamp)
{ {
GtkCssComputedValues *computed;
GtkBitmask *changed; GtkBitmask *changed;
GPtrArray *old_animated_values;
GSList *list; GSList *list;
g_return_val_if_fail (GTK_IS_CSS_ANIMATED_VALUES (values), NULL); g_return_val_if_fail (GTK_IS_CSS_ANIMATED_VALUES (values), NULL);
g_return_val_if_fail (timestamp >= values->current_time, NULL); g_return_val_if_fail (timestamp >= values->current_time, NULL);
computed = GTK_CSS_COMPUTED_VALUES (values);
changed = _gtk_bitmask_new (); changed = _gtk_bitmask_new ();
values->current_time = timestamp; values->current_time = timestamp;
old_animated_values = computed->animated_values;
computed->animated_values = NULL;
list = values->animations; list = values->animations;
while (list) while (list)
@ -386,6 +385,9 @@ _gtk_css_animated_values_advance (GtkCssAnimatedValues *values,
} }
} }
if (old_animated_values)
g_ptr_array_unref (old_animated_values);
return changed; return changed;
} }

1
gtk/gtkcssanimatedvaluesprivate.h
View File

@ -39,7 +39,6 @@ struct _GtkCssAnimatedValues
GtkCssComputedValues parent; GtkCssComputedValues parent;
gint64 current_time; /* the current time in our world */ gint64 current_time; /* the current time in our world */
GtkCssComputedValues *computed; /* the computed values we'd have without animations */
GSList *animations; /* the running animations */ GSList *animations; /* the running animations */
}; };

5
gtk/gtkcssanimation.c
View File

@ -125,9 +125,8 @@ gtk_css_animation_set_values (GtkStyleAnimation *style_animation,
value = _gtk_css_keyframes_get_value (animation->keyframes, value = _gtk_css_keyframes_get_value (animation->keyframes,
i, i,
progress, progress,
_gtk_css_computed_values_get_value (values, i)); _gtk_css_computed_values_get_intrinsic_value (values, i));
/* XXX: Is using 0 correct here? */ _gtk_css_computed_values_set_animated_value (values, property_id, value);
_gtk_css_computed_values_set_value (values, property_id, value, 0, NULL);
_gtk_css_value_unref (value); _gtk_css_value_unref (value);
changed = _gtk_bitmask_set (changed, property_id, TRUE); changed = _gtk_bitmask_set (changed, property_id, TRUE);

3
gtk/gtkcsstransition.c
View File

@ -52,8 +52,7 @@ gtk_css_transition_set_values (GtkStyleAnimation *animation,
value = _gtk_css_value_ref (transition->end); value = _gtk_css_value_ref (transition->end);
} }
/* XXX: Is using 0 correct here? */ _gtk_css_computed_values_set_animated_value (values, transition->property, value);
_gtk_css_computed_values_set_value (values, transition->property, value, 0, NULL);
_gtk_css_value_unref (value); _gtk_css_value_unref (value);
return _gtk_bitmask_set (changed, transition->property, TRUE); return _gtk_bitmask_set (changed, transition->property, TRUE);