From 9e69be9f6fb8589dbced06391a8ac945a0a10db1 Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Fri, 30 Aug 2019 09:27:05 +0100
Subject: [PATCH] Bug 2182 - Updating Audacity can cause messed up toolbar
 layout

---
 src/toolbars/ToolManager.cpp | 41 ------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/src/toolbars/ToolManager.cpp b/src/toolbars/ToolManager.cpp
index 1b98e9155..248844045 100644
--- a/src/toolbars/ToolManager.cpp
+++ b/src/toolbars/ToolManager.cpp
@@ -890,51 +890,10 @@ void ToolManager::ReadConfig()
       d->LoadConfig();
 
       // Add all unordered toolbars
-      bool deviceWasPositioned = false;
       for( int ord = 0; ord < (int) unordered[ dock ].size(); ord++ )
       {
          ToolBar *t = mBars[ unordered[ dock ][ ord ] ].get();
 
-         if (deviceWasPositioned &&
-             t->GetType() == DeviceBarID)
-            continue;
-
-         if (someFound &&
-             t->GetType() == ScrubbingBarID) {
-            // Special case code to put the NEW scrubbing toolbar where we
-            // want it, when audacity.cfg is present from an older version
-            ToolBar *lastRoot {};
-
-            // Change from the ideal configuration to the constrained one,
-            // just as when dragging and dropping
-            ToolBarConfiguration dummy;
-            mTopDock->WrapConfiguration(dummy);
-
-            // Start a NEW row with just the scrubbing toolbar
-            auto &configuration = mTopDock->GetConfiguration();
-            for (const auto place : configuration)
-               if (place.position.rightOf == nullptr)
-                  lastRoot = place.pTree->pBar;
-            ToolBarConfiguration::Position position {
-               nullptr, lastRoot, false
-            };
-            mTopDock->Dock(t, false, position);
-
-            // Reposition the device toolbar, if it was docked above,
-            // right of scrubbing
-            const auto deviceToolBar = mBars[ DeviceBarID ].get();
-            if (deviceToolBar->GetDock() == mTopDock) {
-               deviceToolBar->GetDock()->Undock(deviceToolBar);
-               position = ToolBarConfiguration::Position{ t, nullptr };
-               mTopDock->Dock(deviceToolBar, false, position);
-
-               // Remember not to place the device toolbar again
-               deviceWasPositioned = true;
-            }
-            Expose( t->GetId(), show[ t->GetId() ] );
-            continue;
-         }
-
          // Dock it
          d->Dock( t, false );