summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-11-26 18:10:29 -0800
committerJasper St. Pierre <jstpierre@mecheye.net>2014-11-26 18:10:55 -0800
commit9c7a5f5efafaa01ccc57a82cc4619f433cbda699 (patch)
treee1f7701bb2e49187b5dff35605ff2505114e6574
parent50c4fdbacd20a48e39a6b633eaad6822566411c2 (diff)
downloadgtk+-9c7a5f5efafaa01ccc57a82cc4619f433cbda699.tar.gz
gtkstylecontext: Optimize GtkStyleContext usage
-rw-r--r--gtk/gtkstylecontext.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 3745804f0d..8205ec807e 100644
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -3255,14 +3255,18 @@ G_GNUC_END_IGNORE_DEPRECATIONS
}
else
{
- gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, color);
+ GtkStateFlags state;
+
+ state = gtk_style_context_get_state (context);
+
+ gtk_style_context_get_color (context, state, color);
if (!primary)
{
GdkRGBA bg;
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
- gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+ gtk_style_context_get_background_color (context, state, &bg);
G_GNUC_END_IGNORE_DEPRECATIONS
color->red = (color->red + bg.red) * 0.5;