Commit 422e5958 authored by Benoit's avatar Benoit Committed by Jean-Baptiste Kempf

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

Fix #16763
Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent 06512bf6
...@@ -816,15 +816,15 @@ void MainInterface::setVideoFullScreen( bool fs ) ...@@ -816,15 +816,15 @@ void MainInterface::setVideoFullScreen( bool fs )
} }
/* */ /* */
setMinimalView( true ); displayNormalView();
setInterfaceFullScreen( true ); setInterfaceFullScreen( true );
} }
else else
{ {
/* TODO do we want to restore screen and position ? (when /* TODO do we want to restore screen and position ? (when
* qt-fullscreen-screennumber is forced) */ * qt-fullscreen-screennumber is forced) */
setInterfaceFullScreen( b_interfaceFullScreen );
setMinimalView( b_minimalView ); setMinimalView( b_minimalView );
setInterfaceFullScreen( b_interfaceFullScreen );
#ifdef _WIN32 #ifdef _WIN32
changeThumbbarButtons( THEMIM->getIM()->playingStatus() ); changeThumbbarButtons( THEMIM->getIM()->playingStatus() );
#endif #endif
...@@ -975,9 +975,22 @@ void MainInterface::dockPlaylist( bool p_docked ) ...@@ -975,9 +975,22 @@ 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 * setMinimalView is the private function used by
* the SLOT toggleMinimalView and setVideoFullScreen * the SLOT toggleMinimalView
*/ */
void MainInterface::setMinimalView( bool b_minimal ) void MainInterface::setMinimalView( bool b_minimal )
{ {
......
...@@ -123,6 +123,7 @@ private: ...@@ -123,6 +123,7 @@ private:
void restoreStackOldWidget(); void restoreStackOldWidget();
/* */ /* */
void displayNormalView();
void setMinimalView( bool ); void setMinimalView( bool );
void setInterfaceFullScreen( bool ); void setInterfaceFullScreen( bool );
void computeMinimumSize(); void computeMinimumSize();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment