sync with 2.0 branch (fix auto-rasie with gtk issue)

diff --git a/src/Window.cc b/src/Window.cc
index 72643c2de73d4bddf8faa6cc9a28d36e67d913bb..701482d05c8823dfa9476b0d3f10a72ba4b4a55c 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3859,10 +3859,15 @@ void BlackboxWindow::enterNotifyEvent(const XCrossingEvent* ce) {
       bool success = setInputFocus();
       if (success)    // if focus succeeded install the colormap
         installColormap(True); // XXX: shouldnt we honour no install?
-    }
 
-    if (screen->doAutoRaise())
-      timer->start();
+      /*
+        We only auto-raise when the window wasn't focused because otherwise
+        we run into problems with gtk+ drop-down lists. The window ends up
+        raising over the list.
+      */
+      if (screen->doAutoRaise())
+        timer->start();
+    }
   }
 }