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

stylecontext: Do not have a default style

Browse Source 
A bunch of applications expect the style to be as close to the actual
style as possible even during creation of the widget. Try to accomodate
these apps.

This reverses the effects of 27285f1f0f

https://bugzilla.gnome.org/show_bug.cgi?id=743395
https://bugzilla.redhat.com/show_bug.cgi?id=1185999
This commit is contained in:
Benjamin Otte 2015-02-04 18:26:32 +01:00
parent 7281419341
commit 473ab791ff
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkstylecontext.c
View File

@ -420,7 +420,6 @@ gtk_style_context_init (GtkStyleContext *style_context)
/* Create default info store */
priv->cssnode = gtk_css_node_new ();
gtk_css_node_declaration_set_state (&priv->cssnode->decl, GTK_STATE_FLAG_DIR_LTR);
priv->cssnode->values = g_object_ref (gtk_css_static_style_get_default ());
priv->property_cache = g_array_new (FALSE, FALSE, sizeof (PropertyValue));
@ -881,8 +880,6 @@ gtk_style_context_lookup_style (GtkStyleContext *context)
if (cssnode->values)
return cssnode->values;
g_assert (gtk_style_context_is_saved (context));
values = g_hash_table_lookup (priv->style_values, cssnode->decl);
if (values)
{
@ -2978,7 +2975,10 @@ _gtk_style_context_validate (GtkStyleContext *context,
priv->pending_changes = 0;
gtk_style_context_set_invalid (context, FALSE);
current = g_object_ref (cssnode->values);
current = cssnode->values;
if (current == NULL)
current = gtk_css_static_style_get_default ();
g_object_ref (current);
/* Try to avoid invalidating if we can */
if (gtk_style_context_style_needs_full_revalidate (current, change))