Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-26 00:58:37 +02:00
Code Issues Releases Wiki Activity

Bug 1640 - Reset Toolbars reduces Selection Toolbar to a stub

Browse Source
This commit is contained in:
James Crook 2017-05-04 16:49:02 +01:00
parent 78135d25fd
commit a2ba221554
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/toolbars/ToolManager.cpp
View File

@ -542,24 +542,20 @@ void ToolManager::Reset()
floater = bar->GetParent(); floater = bar->GetParent();
} }
// Decide which dock.
if (ndx == SelectionBarID if (ndx == SelectionBarID
#ifdef EXPERIMENTAL_SPECTRAL_EDITING #ifdef EXPERIMENTAL_SPECTRAL_EDITING
|| ndx == SpectralSelectionBarID || ndx == SpectralSelectionBarID
#endif #endif
) )
{
dock = mBotDock; dock = mBotDock;
wxCommandEvent e;
bar->GetEventHandler()->ProcessEvent(e);
}
else else
{
dock = mTopDock; dock = mTopDock;
bar->ReCreateButtons();
}
// Recreate bar buttons (and resize it)
bar->ReCreateButtons();
bar->EnableDisableButtons(); bar->EnableDisableButtons();
#if 0 #if 0
if( bar->IsResizable() ) if( bar->IsResizable() )
{ {
@ -567,6 +563,7 @@ void ToolManager::Reset()
} }
#endif #endif
// Hide some bars.
if( ndx == MeterBarID if( ndx == MeterBarID
#ifdef EXPERIMENTAL_SPECTRAL_EDITING #ifdef EXPERIMENTAL_SPECTRAL_EDITING
|| ndx == SpectralSelectionBarID || ndx == SpectralSelectionBarID
@ -579,10 +576,10 @@ void ToolManager::Reset()
|| ndx == SelectionBarID || ndx == SelectionBarID
#endif #endif
) )
{
expose = false; expose = false;
}
// Next condition will alwys (?) be true, as the reset configuration is
// with no floating toolbars.
if( dock != NULL ) if( dock != NULL )
{ {
// when we dock, we reparent, so bar is no longer a child of floater. // when we dock, we reparent, so bar is no longer a child of floater.