Close the inactive split view when pressing F3 instead of the active …

…view. Open issue: https://bugs.kde.org/show_bug.cgi?id=312834 The patch: https://bugsfiles.kde.org/attachment.cgi?id=104707
Zren · Aug 3, 2018 · 2b546cc · 2b546cc
1 parent 1b79553
commit 2b546cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
@@ -1558,13 +1558,13 @@ void DolphinMainWindow::updateSplitAction()
     const DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
     if (tabPage->splitViewEnabled()) {
         if (tabPage->primaryViewActive()) {
-            splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
-            splitAction->setToolTip(i18nc("@info", "Close left view"));
-            splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));
-        } else {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));
             splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-right-close")));
+        } else {
+            splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
+            splitAction->setToolTip(i18nc("@info", "Close left view"));
+            splitAction->setIcon(QIcon::fromTheme(QStringLiteral("view-left-close")));
         }
     } else {
         splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
@@ -88,14 +88,14 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, const QUrl &secondaryUrl)
             m_secondaryViewContainer->show();
             m_secondaryViewContainer->setActive(true);
         } else {
-            // Close the view which is active.
-            DolphinViewContainer* view = activeViewContainer();
-            if (m_primaryViewActive) {
-                // If the primary view is active, we have to swap the pointers
+            // Close the view which is inactive.
+            if (!m_primaryViewActive) {
+                // If the secondary view is active, we have to swap the pointers
                 // because the secondary view will be the new primary view.
                 qSwap(m_primaryViewContainer, m_secondaryViewContainer);
-                m_primaryViewActive = false;
+                m_primaryViewActive = true;
             }
+            DolphinViewContainer* view = m_secondaryViewContainer;
             m_primaryViewContainer->setActive(true);
             view->close();
             view->deleteLater();