[vlc-commits] Qt: don't change height if widget doesn't change visibility

Hannes Domani git at videolan.org
Mon Feb 29 15:12:08 CET 2016


vlc/vlc-2.2 | branch: master | Hannes Domani <ssbssa at yahoo.de> | Sat Feb 27 19:33:11 2016 +0100| [59ebef692227234e35c5b6c3de48afcb543c5116] | committer: Jean-Baptiste Kempf

Qt: don't change height if widget doesn't change visibility

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 2f0d1f894de37682171fb4c991ef222b9b4a6b2e)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/main_interface.cpp |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 5b726cf..106e9c2 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1021,13 +1021,13 @@ void MainInterface::setMinimalView( bool b_minimal )
     {
         int i_heightChange = 0;
 
-        if( !b_menuBarVisible )
+        if( !b_menuBarVisible && menuBar()->isVisible() )
             i_heightChange += menuBar()->height();
-        if( !b_controlsVisible )
+        if( !b_controlsVisible && controls->isVisible() )
             i_heightChange += controls->height();
         if( !b_statusBarVisible && statusBar()->isVisible() )
             i_heightChange += statusBar()->height();
-        if( !b_inputCVisible )
+        if( !b_inputCVisible && inputC->isVisible() )
             i_heightChange += inputC->height();
 
         if( i_heightChange != 0 )



More information about the vlc-commits mailing list