[vlc-commits] Qt: Solve issue with alwaysOnTop and fullscreen conflicting

Jean-Baptiste Kempf git at videolan.org
Wed May 25 10:57:23 CEST 2011


vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed May 25 10:54:35 2011 +0200| [3ec0c2a90c4c9d680d7356618caf5dce594f5793] | committer: Jean-Baptiste Kempf

Qt: Solve issue with alwaysOnTop and fullscreen conflicting

Win32 only, for some reason (Qt bug?)
Close #3976
(cherry picked from commit ca0d201f5c025b81630e0ccd8a0976877fc05314)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=3ec0c2a90c4c9d680d7356618caf5dce594f5793
---

 modules/gui/qt4/main_interface.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index a3ad197..6f2590b 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -659,8 +659,8 @@ void MainInterface::setVideoOnTop( bool on_top )
         newflags = oldflags | Qt::WindowStaysOnTopHint;
     else
         newflags = oldflags & ~Qt::WindowStaysOnTopHint;
+    if( newflags != oldflags && !b_videoFullScreen )
 
-    if( newflags != oldflags )
     {
         setWindowFlags( newflags );
         show(); /* necessary to apply window flags */



More information about the vlc-commits mailing list