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

stylecontext: Don't use cache when unsaved

Browse Source 
Fixes image-load-from-file reftest
This commit is contained in:
Benjamin Otte 2015-02-10 23:49:15 +01:00
parent 9e96461aa5
commit b763bb0594
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkstylecontext.c
View File

@ -883,17 +883,24 @@ gtk_style_context_lookup_style (GtkStyleContext *context)
if (cssnode->values)
return cssnode->values;
values = g_hash_table_lookup (priv->style_values, cssnode->decl);
if (values)
if (!gtk_style_context_is_saved (context))
{
gtk_css_node_set_values (cssnode, values);
return values;
values = build_properties (context, cssnode->decl, TRUE, gtk_css_node_get_parent_style (context, cssnode));
}
else
{
values = g_hash_table_lookup (priv->style_values, cssnode->decl);
if (values)
{
gtk_css_node_set_values (cssnode, values);
return values;
}
values = build_properties (context, cssnode->decl, FALSE, gtk_css_node_get_parent_style (context, cssnode));
g_hash_table_insert (priv->style_values,
gtk_css_node_declaration_ref (cssnode->decl),
g_object_ref (values));
values = build_properties (context, cssnode->decl, FALSE, gtk_css_node_get_parent_style (context, cssnode));
g_hash_table_insert (priv->style_values,
gtk_css_node_declaration_ref (cssnode->decl),
g_object_ref (values));
}
gtk_css_node_set_values (cssnode, values);
g_object_unref (values);