From: Ludovic Fauvet <etix@videolan.org>
Date: Thu, 29 Sep 2011 15:59:44 +0000 (+0200)
Subject: Qt: fix a regression on Linux
X-Git-Tag: 1.2.0-pre1~495
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=744bf6f336e380bec9143da02542b3ef104ae5a4;p=vlc

Qt: fix a regression on Linux

Regression introduced in 9367ce0b3a40851a656e136557347fe8e830770c

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
---

diff --git a/modules/gui/qt4/util/timetooltip.cpp b/modules/gui/qt4/util/timetooltip.cpp
index 70ea91442d..01b393e8f3 100644
--- a/modules/gui/qt4/util/timetooltip.cpp
+++ b/modules/gui/qt4/util/timetooltip.cpp
@@ -40,7 +40,14 @@ TimeTooltip::TimeTooltip( QWidget *parent ) :
     // Tell Qt that it doesn't need to erase the background before
     // a paintEvent occurs. This should save some CPU cycles.
     setAttribute( Qt::WA_OpaquePaintEvent );
+
+#ifdef Q_WS_WIN
+    /*
+    - This attribute is required on Windows to avoid focus stealing of other windows.
+    - When set on Linux the TimeTooltip appears behind the FSController in fullscreen.
+    */
     setAttribute( Qt::WA_ShowWithoutActivating );
+#endif
 
     // Inherit from the system default font size -5
     mFont = QFont( "Verdana", qMax( qApp->font().pointSize() - 5, 7 ) );