Commit b2c94a56 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

GladeDesignLayout: Avoid GTK+ warnings

GTK+ warns nowadays if the state passed to gtk_style_context_get_*
does not match the state of the context. Avoid this by setting
the state beforehand. This is just a bandaid fix; the drawing
should be redone in terms of gtk_render_ APIs instead of poking
at colors.

https://bugzilla.gnome.org/show_bug.cgi?id=758296
parent 74e95093
...@@ -2210,12 +2210,16 @@ _glade_design_layout_get_colors (GtkStyleContext *context, ...@@ -2210,12 +2210,16 @@ _glade_design_layout_get_colors (GtkStyleContext *context,
GdkRGBA *c3, GdkRGBA *c4) GdkRGBA *c3, GdkRGBA *c4)
{ {
gfloat off; gfloat off;
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, c1);
gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, c2);
gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED, c3); gtk_style_context_save (context);
gtk_style_context_get_color (context, GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED, c4); gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
gtk_style_context_get_background_color (context, gtk_style_context_get_state (context), c1);
gtk_style_context_get_color (context, gtk_style_context_get_state (context), c2);
gtk_style_context_set_state (context, gtk_style_context_get_state (context) | GTK_STATE_FLAG_SELECTED | GTK_STATE_FLAG_FOCUSED);
gtk_style_context_get_background_color (context, gtk_style_context_get_state (context), c3);
gtk_style_context_get_color (context, gtk_style_context_get_state (context), c4);
gtk_style_context_restore (context);
off = ((c1->red + c1->green + c1->blue)/3 < .5) ? .16 : -.16; off = ((c1->red + c1->green + c1->blue)/3 < .5) ? .16 : -.16;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment