Qt4: do not set fullscreen window on top (fixes #3712)

Normally, the window will go on top of the stack of normal windows
anyway. If not, we may need to force this, which is different from
always-on-top in any case.

Known issue: toggling video on top while in fullscreen is not
implemented yet.

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index f33bac1c21616dd8b5220874b1c3fab17b812f35..655600be136d0ccdd5cc5a5f3e5b75a1f53547fc 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -187,7 +187,7 @@ void VideoWidget::SetSizing( unsigned int w, unsigned int h )
     videoSync();
 }
 
-void VideoWidget::SetFullScreen( bool b_fs )
+void VideoWidget::SetFullScreen( bool b_fs, bool b_ontop )
 {
     const Qt::WindowStates curstate = reparentable->windowState();
     Qt::WindowStates newstate = curstate;
@@ -197,7 +197,8 @@ void VideoWidget::SetFullScreen( bool b_fs )
     if( b_fs )
     {
         newstate |= Qt::WindowFullScreen;
-        newflags |= Qt::WindowStaysOnTopHint;
+        if( b_ontop )
+            newflags |= Qt::WindowStaysOnTopHint;
     }
     else
     {

diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index c3fcd3a39ebb2d3edc0918ca7f2ffe6a0d179055..7b9e2b92b69a5654022458edd587e4aeed8a98e5 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -61,6 +61,7 @@ public:
     WId request( int *, int *, unsigned int *, unsigned int *, bool );
     void  release( void );
     int   control( void *, int, va_list );
+    void SetFullScreen( bool, bool );
 
 protected:
     virtual QPaintEngine *paintEngine() const
@@ -80,7 +81,6 @@ signals:
 
 public slots:
     void SetSizing( unsigned int, unsigned int );
-    void SetFullScreen( bool );
 };
 
 /******************** Background Widget ****************/

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index bbb6014ac3d50c37f3f190f1113d7dbda2e40708..562dfc83a8a30f92fb62fe67e17c681e7144d32e 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -603,7 +603,7 @@ void MainInterface::setVideoFullScreen( bool fs )
     b_videoFullScreen = fs;
     /* refresh main interface on-top status if needed */
     setVideoOnTop( b_videoOnTop );
-    videoWidget->SetFullScreen( fs );
+    videoWidget->SetFullScreen( fs, b_videoOnTop );
 }
 
 /* Slot to change the video always-on-top flag.