audacia/audacia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Default all toolbars to docked on reset and new config

Browse Source 
Combined meter and spectral toolbars default to hidden.
This commit is contained in:
lllucius 2014-12-20 22:03:10 +00:00
parent 9404a28954
commit 6a0492e15d
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/toolbars/ToolManager.cpp
View File

@ -475,6 +475,7 @@ void ToolManager::Reset()
wxWindow *floater;
ToolDock *dock;
ToolBar *bar = mBars[ ndx ];
bool expose = true;
// Disconnect the bar
if( bar->IsDocked() )
@ -487,21 +488,17 @@ void ToolManager::Reset()
floater = bar->GetParent();
}
if (ndx == SelectionBarID )
if (ndx == SelectionBarID
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
|| ndx == SpectralSelectionBarID
#endif
)
{
dock = mBotDock;
wxCommandEvent e;
bar->GetEventHandler()->ProcessEvent(e);
}
else if( ndx == MeterBarID
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
|| ndx == SpectralSelectionBarID
#endif
)
{
dock = NULL;
}
else
{
dock = mTopDock;
@ -516,11 +513,20 @@ void ToolManager::Reset()
}
#endif
if( ndx == MeterBarID
#ifdef EXPERIMENTAL_SPECTRAL_EDITING
|| ndx == SpectralSelectionBarID
#endif
)
{
expose = false;
}
if( dock != NULL )
{
// when we dock, we reparent, so bar is no longer a child of floater.
dock->Dock( bar );
Expose( ndx, true );
Expose( ndx, expose );
//OK (and good) to delete floater, as bar is no longer in it.
if( floater )
floater->Destroy();