From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Fri, 1 Aug 2008 21:57:39 +0000 (-0700)
Subject: Fix the activation or not of advanced buttons in fullscreen controller
X-Git-Tag: 0.9.0-test3~29
X-Git-Url: https://git.sesse.net/?p=vlc;a=commitdiff_plain;h=175d1beb96ca494f8bfdee0ad488b303ef55e9ec

Fix the activation or not of advanced buttons in fullscreen controller
---

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index eeff71a7f4..6ce1adbc6a 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -889,7 +889,7 @@ void ControlsWidget::enableVideo( bool enable )
 
 void ControlsWidget::toggleAdvanced()
 {
-    if( !VISIBLE( advControls ) )
+    if( advControls && !b_advancedVisible )
     {
         advControls->show();
         b_advancedVisible = true;
@@ -961,6 +961,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
 #ifdef WIN32TRICK
     setWindowOpacity( 0.0 );
     fscHidden = true;
+    adjustSize();
     show();
 #endif
 
@@ -977,6 +978,7 @@ FullscreenControllerWidget::~FullscreenControllerWidget()
  */
 void FullscreenControllerWidget::showFSC()
 {
+    adjustSize();
 #ifdef WIN32TRICK
     // after quiting and going to fs, we need to call show()
     if( isHidden() )
diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 0641b25171..0ee6864c30 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -832,6 +832,7 @@ void MainInterface::doComponentsUpdate()
 void MainInterface::toggleAdvanced()
 {
     controls->toggleAdvanced();
+    fullscreenControls->toggleAdvanced();
 }
 
 /* Get the visibility status of the controls (hidden or not, advanced or not) */