1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-05 14:18:53 +02:00

Fix: Undock Tools toolbar; then reset toolbars Mac...

... Used to need two resets to get the correct result, now only one.
This commit is contained in:
Paul Licameli 2018-01-21 23:01:35 -05:00
parent fb101964df
commit 01634938cc

View File

@ -538,6 +538,13 @@ void ToolManager::Reset()
else
dock = mTopDock;
// PRL: Destroy the tool frame before recreating buttons.
// This fixes some subtle sizing problems on macOs.
bar->Reparent( dock );
//OK (and good) to DELETE floater, as bar is no longer in it.
if( floater )
floater->Destroy();
// Recreate bar buttons (and resize it)
bar->ReCreateButtons();
bar->EnableDisableButtons();
@ -571,9 +578,6 @@ void ToolManager::Reset()
// when we dock, we reparent, so bar is no longer a child of floater.
dock->Dock( bar, false, position );
Expose( ndx, expose );
//OK (and good) to DELETE floater, as bar is no longer in it.
if( floater )
floater->Destroy();
}
else
{