[vlc-commits] Qt: exiting fullscreen now restores the window to the correct size

[Benoît Noël du Payrat]

vlc/vlc-2.2 | branch: master | Benoît Noël du Payrat <benoitp at localhost.localdomain> | Mon Apr 25 18:09:00 2016 +0200| [648ceb997f2ffe2aceeaa76909bcf292988f033b] | committer: Jean-Baptiste Kempf

Qt: exiting fullscreen now restores the window to the correct size

Fix #16763

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=648ceb997f2ffe2aceeaa76909bcf292988f033b
---

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

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 106e9c2..e75c7bb 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -825,15 +825,15 @@ void MainInterface::setVideoFullScreen( bool fs )
         }
 
         /* */
-        setMinimalView( true );
+        displayNormalView();
         setInterfaceFullScreen( true );
     }
     else
     {
         /* TODO do we want to restore screen and position ? (when
          * qt-fullscreen-screennumber is forced) */
-        setInterfaceFullScreen( b_interfaceFullScreen );
         setMinimalView( b_minimalView );
+        setInterfaceFullScreen( b_interfaceFullScreen );
 #ifdef _WIN32
         changeThumbbarButtons( THEMIM->getIM()->playingStatus() );
 #endif
@@ -985,6 +985,19 @@ void MainInterface::dockPlaylist( bool p_docked )
 }
 
 /*
+ * displayNormalView is the private function used by
+ * the SLOT setVideoFullScreen to restore the menuBar
+ * if minimal view is off
+ */
+void MainInterface::displayNormalView()
+{
+    menuBar()->setVisible( false );
+    controls->setVisible( false );
+    statusBar()->setVisible( false );
+    inputC->setVisible( false );
+}
+
+/*
  * setMinimalView is the private function used by
  * the SLOT toggleMinimalView and setVideoFullScreen
  */
diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index 8d59f65..85967f7 100644
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -125,6 +125,7 @@ private:
     void restoreStackOldWidget();
 
     /* */
+    void displayNormalView();
     void setMinimalView( bool );
     void setInterfaceFullScreen( bool );
     void computeMinimumSize();