AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

csscomputedvalues: Compute the changes by animations ourselves

Browse Source 
Instead of letting the animation set a bitmask unconditionally, actually
compare the before and after values for changes.
This commit is contained in:
Benjamin Otte 2012-09-16 18:51:07 +02:00
parent ee6f886434
commit 2147473131
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkcsscomputedvalues.c
View File

@ -508,6 +508,7 @@ _gtk_css_computed_values_advance (GtkCssComputedValues *values,
GtkBitmask *changed; GtkBitmask *changed;
GPtrArray *old_computed_values; GPtrArray *old_computed_values;
GSList *list; GSList *list;
guint i;
g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL);
g_return_val_if_fail (timestamp >= values->current_time, NULL); g_return_val_if_fail (timestamp >= values->current_time, NULL);
@ -536,7 +537,23 @@ _gtk_css_computed_values_advance (GtkCssComputedValues *values,
g_object_unref (animation); g_object_unref (animation);
} }
} }
_gtk_bitmask_free (changed);
/* figure out changes */
changed = _gtk_bitmask_new ();
for (i = 0; i < GTK_CSS_PROPERTY_N_PROPERTIES; i++)
{
GtkCssValue *old_animated, *new_animated;
old_animated = old_computed_values && i < old_computed_values->len ? g_ptr_array_index (old_computed_values, i) : NULL;
new_animated = values->animated_values && i < values->animated_values->len ? g_ptr_array_index (values->animated_values, i) : NULL;
if (!_gtk_css_value_equal0 (old_animated, new_animated))
changed = _gtk_bitmask_set (changed, i, TRUE);
}
if (old_computed_values) if (old_computed_values)
g_ptr_array_unref (old_computed_values); g_ptr_array_unref (old_computed_values);