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

stylecontext: Avoid style_context_save() calls

Browse Source 
Introduce style_data_lookup_for_state() that does this.
This commit is contained in:
Benjamin Otte 2012-04-11 16:36:48 +02:00
parent 2179580c8e
commit 35e36b9fe5
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtkstylecontext.c
View File

@ -994,6 +994,23 @@ style_data_lookup (GtkStyleContext *context)
return data;
}
static StyleData *
style_data_lookup_for_state (GtkStyleContext *context,
GtkStateFlags state)
{
StyleData *data;
if (context->priv->info->state_flags == state)
return style_data_lookup (context);
gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
data = style_data_lookup (context);
gtk_style_context_restore (context);
return data;
}
static void
gtk_style_context_set_invalid (GtkStyleContext *context,
gboolean invalid)
@ -1338,11 +1355,8 @@ gtk_style_context_get_property (GtkStyleContext *context,
return;
}
gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
data = style_data_lookup (context);
data = style_data_lookup_for_state (context, state);
_gtk_style_property_query (prop, value, gtk_style_context_query_func, data->store);
gtk_style_context_restore (context);
}
/**
@ -2195,10 +2209,7 @@ _gtk_style_context_peek_style_property (GtkStyleContext *context,
priv = context->priv;
gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
data = style_data_lookup (context);
gtk_style_context_restore (context);
data = style_data_lookup_for_state (context, state);
key.widget_type = widget_type;
key.state = state;
@ -3421,10 +3432,7 @@ gtk_style_context_get_font (GtkStyleContext *context,
priv = context->priv;
g_return_val_if_fail (priv->widget != NULL || priv->widget_path != NULL, NULL);
gtk_style_context_save (context);
gtk_style_context_set_state (context, state);
data = style_data_lookup (context);
gtk_style_context_restore (context);
data = style_data_lookup_for_state (context, state);
/* Yuck, fonts are created on-demand but we don't return a ref.
* Do bad things to achieve this requirement */