[vlc-commits] Qt: fix a regression on Linux

Ludovic Fauvet git at videolan.org
Fri Sep 30 16:31:45 CEST 2011


vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Thu Sep 29 17:59:44 2011 +0200| [744bf6f336e380bec9143da02542b3ef104ae5a4] | committer: Jean-Baptiste Kempf

Qt: fix a regression on Linux

Regression introduced in 9367ce0b3a40851a656e136557347fe8e830770c

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=744bf6f336e380bec9143da02542b3ef104ae5a4
---

 modules/gui/qt4/util/timetooltip.cpp |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/util/timetooltip.cpp b/modules/gui/qt4/util/timetooltip.cpp
index 70ea914..01b393e 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 ) );



More information about the vlc-commits mailing list