From 0bf69bc499b64fe2cb29ac2c32213cf8644c9554 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 25 Oct 2023 09:18:49 +0200
Subject: [PATCH] NavigationWidgets: Fix the side that shortcuts open

The activationsMap logs were a specific view was opened last.

We need to clear outdated information from the navigation widgets'
(left|right) settings (if a view was opened last in the left widget,
that was written to the left widget's settings, but it was not cleared
from the right widget's settings, so if it ever was opened last on the
right side, that information stuck).

When restoring the state of the left|right widgets, we may not overwrite
the previously restored activationsMap.

Fixes: QTCREATORBUG-29770
Change-Id: I14c85c24f279208fb94707514cc4a8cba184e03c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/coreplugin/navigationwidget.cpp | 19 +++++++++++++------
 src/plugins/coreplugin/navigationwidget.h   |  4 +++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 382a290bc6d..d2b1dafcd51 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -7,7 +7,6 @@
 #include "coreplugintr.h"
 #include "icontext.h"
 #include "icore.h"
-#include "imode.h"
 #include "inavigationwidgetfactory.h"
 #include "modemanager.h"
 #include "navigationsubwidget.h"
@@ -297,7 +296,9 @@ static QIcon closeIconForSide(Side side, int itemCount)
             : Utils::Icons::CLOSE_SPLIT_RIGHT.icon();
 }
 
-Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position, int factoryIndex)
+Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position,
+                                                               int factoryIndex,
+                                                               bool updateActivationsMap)
 {
     for (int pos = position + 1; pos < d->m_subWidgets.size(); ++pos) {
         Internal::NavigationSubWidget *nsw = d->m_subWidgets.at(pos);
@@ -323,7 +324,8 @@ Internal::NavigationSubWidget *NavigationWidget::insertSubItem(int position, int
 
     d->m_subWidgets.insert(position, nsw);
     d->m_subWidgets.at(0)->setCloseIcon(closeIconForSide(d->m_side, d->m_subWidgets.size()));
-    NavigationWidgetPrivate::updateActivationsMap(nsw->factory()->id(), {d->m_side, position});
+    if (updateActivationsMap)
+        NavigationWidgetPrivate::updateActivationsMap(nsw->factory()->id(), {d->m_side, position});
     return nsw;
 }
 
@@ -400,8 +402,11 @@ void NavigationWidget::saveSettings(QtcSettings *settings)
     const auto keys = NavigationWidgetPrivate::s_activationsMap.keys();
     for (const auto &factoryId : keys) {
         const auto &info = NavigationWidgetPrivate::s_activationsMap[factoryId];
+        const Utils::Key key = settingsKey(activationKey + factoryId.name());
         if (info.side == d->m_side)
-            settings->setValue(settingsKey(activationKey + factoryId.name()), info.position);
+            settings->setValue(key, info.position);
+        else
+            settings->remove(key);
     }
 }
 
@@ -434,7 +439,7 @@ void NavigationWidget::restoreSettings(QtcSettings *settings)
         int index = factoryIndex(Id::fromString(id));
         if (index >= 0) {
             // Only add if the id was actually found!
-            insertSubItem(position, index);
+            insertSubItem(position, index, /*updateActivationsMap=*/false);
             ++position;
         } else {
             restoreSplitterState = false;
@@ -443,7 +448,9 @@ void NavigationWidget::restoreSettings(QtcSettings *settings)
 
     if (d->m_subWidgets.isEmpty())
         // Make sure we have at least the projects widget or outline widget
-        insertSubItem(0, qMax(0, factoryIndex(Id::fromString(defaultFirstView(d->m_side)))));
+        insertSubItem(0,
+                      qMax(0, factoryIndex(Id::fromString(defaultFirstView(d->m_side)))),
+                      /*updateActivationsMap=*/false);
 
     setShown(settings->value(settingsKey("Visible"), defaultVisible(d->m_side)).toBool());
 
diff --git a/src/plugins/coreplugin/navigationwidget.h b/src/plugins/coreplugin/navigationwidget.h
index d89105e75d9..40ea1a5fa0c 100644
--- a/src/plugins/coreplugin/navigationwidget.h
+++ b/src/plugins/coreplugin/navigationwidget.h
@@ -97,7 +97,9 @@ protected:
 private:
     void closeSubWidget(Internal::NavigationSubWidget *subWidget);
     void updateToggleText();
-    Internal::NavigationSubWidget *insertSubItem(int position, int factoryIndex);
+    Internal::NavigationSubWidget *insertSubItem(int position,
+                                                 int factoryIndex,
+                                                 bool updateActivationsMap = true);
     int factoryIndex(Utils::Id id);
     Utils::Key settingsKey(const Utils::Key &key) const;