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 eeff71a7f42ee8e1c8f5c5ba882746aa76625bd4..6ce1adbc6ab55e759b7c529e320a488cb39536b4 100644 (file)
--- 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 0641b25171ce9fb802d2fc1e95ae26511e662cfb..0ee6864c308b03d84955c1c9fc91552e2b4fed1e 100644 (file)
--- 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) */