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

cssnode: Propagate pending changes after recomputing new style

Browse Source 
This way we can propagate if the new style actually changed anything.
This commit is contained in:
Benjamin Otte 2015-02-18 05:55:38 +01:00
parent cadf6a9d3c
commit ceaa594fa4
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcssnode.c
View File

@ -575,11 +575,12 @@ gtk_css_node_ensure_style (GtkCssNode *cssnode)
if (cssnode->previous_sibling) if (cssnode->previous_sibling)
gtk_css_node_ensure_style (cssnode->previous_sibling); gtk_css_node_ensure_style (cssnode->previous_sibling);
gtk_css_node_propagate_pending_changes (cssnode);
new_style = GTK_CSS_NODE_GET_CLASS (cssnode)->update_style (cssnode, new_style = GTK_CSS_NODE_GET_CLASS (cssnode)->update_style (cssnode,
cssnode->pending_changes, cssnode->pending_changes,
cssnode->style); cssnode->style);
gtk_css_node_propagate_pending_changes (cssnode);
if (new_style) if (new_style)
{ {
gtk_css_node_set_style (cssnode, new_style); gtk_css_node_set_style (cssnode, new_style);
@ -771,7 +772,6 @@ gtk_css_node_validate (GtkCssNode *cssnode,
gint64 timestamp, gint64 timestamp,
gboolean parent_changed) gboolean parent_changed)
{ {
GtkCssChange change;
GtkCssNode *child; GtkCssNode *child;
GtkCssStyle *new_style; GtkCssStyle *new_style;
gboolean changed; gboolean changed;
@ -789,20 +789,16 @@ gtk_css_node_validate (GtkCssNode *cssnode,
* the time. * the time.
*/ */
if (G_UNLIKELY (gtk_get_debug_flags () & GTK_DEBUG_NO_CSS_CACHE)) if (G_UNLIKELY (gtk_get_debug_flags () & GTK_DEBUG_NO_CSS_CACHE))
change = GTK_CSS_CHANGE_ANY; cssnode->pending_changes |= GTK_CSS_CHANGE_ANY;
gtk_css_node_propagate_pending_changes (cssnode); if (!cssnode->invalid && cssnode->pending_changes == 0 && !parent_changed)
if (!cssnode->invalid && change == 0 && !parent_changed)
return; return;
gtk_css_node_set_invalid (cssnode, FALSE); gtk_css_node_set_invalid (cssnode, FALSE);
change = cssnode->pending_changes;
cssnode->pending_changes = 0;
cssnode->style_is_invalid = FALSE; cssnode->style_is_invalid = FALSE;
new_style = GTK_CSS_NODE_GET_CLASS (cssnode)->validate (cssnode, cssnode->style, timestamp, change, parent_changed); new_style = GTK_CSS_NODE_GET_CLASS (cssnode)->validate (cssnode, cssnode->style, timestamp, cssnode->pending_changes, parent_changed);
if (new_style) if (new_style)
{ {
gtk_css_node_set_style (cssnode, new_style); gtk_css_node_set_style (cssnode, new_style);
@ -814,6 +810,9 @@ gtk_css_node_validate (GtkCssNode *cssnode,
changed = FALSE; changed = FALSE;
} }
gtk_css_node_propagate_pending_changes (cssnode);
cssnode->pending_changes = 0;
for (child = gtk_css_node_get_first_child (cssnode); for (child = gtk_css_node_get_first_child (cssnode);
child; child;
child = gtk_css_node_get_next_sibling (child)) child = gtk_css_node_get_next_sibling (child))