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

[Hannes Domani]

Hannes Domani <git at videolan.org> schrieb am 19:58 Sonntag, 28.Februar 2016:
> vlc | branch: master | Hannes Domani <ssbssa at yahoo.de> | Sat Feb 27 19:33:11 2016 +0100| [2f0d1f894de37682171fb4c991ef222b9b4a6b2e] | committer: Jean-Baptiste Kempf
> 
> Qt: don't change height if widget doesn't change visibility



Can this please be commited to 2.2 as well, since this fixes the increasing height on vlc exit/startup.


> 
> Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2f0d1f894de37682171fb4c991ef222b9b4a6b2e
> ---
> 
> modules/gui/qt/main_interface.cpp |    6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
> index 90f941c..5fc777d 100644
> --- a/modules/gui/qt/main_interface.cpp
> +++ b/modules/gui/qt/main_interface.cpp
> @@ -1012,13 +1012,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 )