[gtk+/wip/window-unfocused-fixes: 6/13] expander: Set GTK_STATE_FLAG_WINDOW_UNFOCUSED on draw

[Rui Matos <rtcm src gnome org>]

commit 77b90e304c7ad5dbd1b4795eadedab304e295afd
Author: Rui Matos <tiagomatos gmail com>
Date:   Mon Dec 12 00:12:16 2011 +0000

    expander: Set GTK_STATE_FLAG_WINDOW_UNFOCUSED on draw
    
    https://bugzilla.gnome.org/show_bug.cgi?id=666126

 gtk/gtkexpander.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
index 4485454..c47e7e5 100644
--- a/gtk/gtkexpander.c
+++ b/gtk/gtkexpander.c
@@ -888,6 +888,8 @@ gtk_expander_paint (GtkExpander *expander,
   widget = GTK_WIDGET (expander);
   context = gtk_widget_get_style_context (widget);
 
+  state |= (gtk_widget_get_state_flags (widget) & GTK_STATE_FLAG_WINDOW_UNFOCUSED);
+
   get_expander_bounds (expander, &clip);
   gtk_widget_get_allocation (widget, &allocation);
 
@@ -895,15 +897,13 @@ gtk_expander_paint (GtkExpander *expander,
 
   if (expander->priv->prelight)
     {
-      state = GTK_STATE_FLAG_PRELIGHT;
+      state |= GTK_STATE_FLAG_PRELIGHT;
       gtk_style_context_set_state (context, state);
       gtk_expander_paint_prelight (expander, cr);
     }
 
   gtk_widget_style_get (widget, "expander-size", &size, NULL);
 
-  state = gtk_style_context_get_state (context);
-
   /* Set active flag as per the expanded state */
   if (priv->expanded)
     state |= GTK_STATE_FLAG_ACTIVE;