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

stylecontext: Shuffle around code

Browse Source 
This has two goals:

1) Move invalidation code out of a nested if branch. Invalidation is
actually the most important thing this function does.

2) Have the changes bitmask available. It will needed for invalidate
calls to children later.
This commit is contained in:
Benjamin Otte
2012-04-11 12:37:44 +02:00
parent 42d2430498
commit 60eff87d08
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkstylecontext.c
View File

@ -2939,6 +2939,7 @@ _gtk_style_context_validate (GtkStyleContext *context,
GtkCssChange change)
{
GtkStyleContextPrivate *priv;
GtkBitmask *changes;
GSList *list;
g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
@ -2990,27 +2991,31 @@ _gtk_style_context_validate (GtkStyleContext *context,
if (old)
{
GtkBitmask *bitmask;
new = style_data_lookup (context)->store;
bitmask = _gtk_css_computed_values_get_difference (new, old);
if (!_gtk_bitmask_is_empty (bitmask))
gtk_style_context_do_invalidate (context);
changes = _gtk_css_computed_values_get_difference (new, old);
_gtk_bitmask_free (bitmask);
g_object_unref (old);
}
else
gtk_style_context_do_invalidate (context);
{
changes = _gtk_bitmask_new ();
changes = _gtk_bitmask_invert_range (changes, 0, _gtk_css_style_property_get_n_properties ());
}
}
else
changes = _gtk_bitmask_new ();
if (!_gtk_bitmask_is_empty (changes))
gtk_style_context_do_invalidate (context);
change = _gtk_css_change_for_child (change);
for (list = priv->children; list; list = list->next)
{
_gtk_style_context_validate (list->data, timestamp, change);
}
_gtk_bitmask_free (changes);
}
void