Commit 193eaee9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: correctly recreate the toolbar, taking care about the adv status

parent 83e252bb
...@@ -339,11 +339,13 @@ MainInterface::~MainInterface() ...@@ -339,11 +339,13 @@ MainInterface::~MainInterface()
*****************************/ *****************************/
void MainInterface::recreateToolbars() void MainInterface::recreateToolbars()
{ {
bool b_adv = getControlsVisibilityStatus() & CONTROLS_ADVANCED;
settings->beginGroup( "MainWindow" ); settings->beginGroup( "MainWindow" );
delete controls; delete controls;
delete inputC; delete inputC;
controls = new ControlsWidget( p_intf, false, this ); controls = new ControlsWidget( p_intf, b_adv, this );
inputC = new InputControlsWidget( p_intf, this ); inputC = new InputControlsWidget( p_intf, this );
if( fullscreenControls ) if( fullscreenControls )
...@@ -768,6 +770,7 @@ void MainInterface::toggleAdvancedButtons() ...@@ -768,6 +770,7 @@ void MainInterface::toggleAdvancedButtons()
/* Get the visibility status of the controls (hidden or not, advanced or not) */ /* Get the visibility status of the controls (hidden or not, advanced or not) */
int MainInterface::getControlsVisibilityStatus() int MainInterface::getControlsVisibilityStatus()
{ {
if( !controls ) return 0;
return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN ) return( (controls->isVisible() ? CONTROLS_VISIBLE : CONTROLS_HIDDEN )
+ CONTROLS_ADVANCED * controls->b_advancedVisible ); + CONTROLS_ADVANCED * controls->b_advancedVisible );
} }
......
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