diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1550,7 +1550,7 @@
QAction* splitAction = actionCollection()->action(QStringLiteral("split_view"));
const DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
if (tabPage->splitViewEnabled()) {
- if (tabPage->primaryViewActive()) {
+ if (GeneralSettings::closeActiveSplitView() ? tabPage->primaryViewActive() : !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")));
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -88,20 +88,17 @@
m_secondaryViewContainer->show();
m_secondaryViewContainer->setActive(true);
} else {
- // Close the view which is deactive.
DolphinViewContainer* view;
- if (GeneralSettings::closeFocusedSplitView()) {
+ if (GeneralSettings::closeActiveSplitView()) {
view = activeViewContainer();
if (m_primaryViewActive) {
// If the primary 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;
}
} else {
- if (m_primaryViewActive) view = m_secondaryViewContainer;
- else
- view = m_primaryViewContainer;
+ view = m_primaryViewActive ? m_secondaryViewContainer : m_primaryViewContainer;
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.
diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -70,7 +70,7 @@
false
-
+
true
diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -67,7 +67,7 @@
QCheckBox* m_renameInline;
QCheckBox* m_useTabForSplitViewSwitch;
- QCheckBox* m_closeFocusedSplitView;
+ QCheckBox* m_closeActiveSplitView;
};
#endif
diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -100,9 +100,9 @@
m_useTabForSplitViewSwitch = new QCheckBox(i18nc("option:check", "Switch between split views with tab key"));
topLayout->addRow(QString(), m_useTabForSplitViewSwitch);
- // 'Close focused view when turning off split view'
- m_closeFocusedSplitView = new QCheckBox(i18nc("option:check", "Close focused split view when toggling off"));
- topLayout->addRow(QString(), m_closeFocusedSplitView);
+ // 'Close active view when turning off split view'
+ m_closeActiveSplitView = new QCheckBox(i18nc("option:check", "Close active split view when turning off"));
+ topLayout->addRow(QString(), m_closeActiveSplitView);
loadSettings();
@@ -117,7 +117,7 @@
connect(m_caseSensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed);
connect(m_renameInline, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
connect(m_useTabForSplitViewSwitch, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
- connect(m_closeFocusedSplitView, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
+ connect(m_closeActiveSplitView, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed);
}
BehaviorSettingsPage::~BehaviorSettingsPage()
@@ -138,7 +138,7 @@
setSortingChoiceValue(settings);
settings->setRenameInline(m_renameInline->isChecked());
settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->isChecked());
- settings->setCloseFocusedSplitView(m_closeFocusedSplitView->isChecked());
+ settings->setCloseActiveSplitView(m_closeActiveSplitView->isChecked());
settings->save();
if (useGlobalViewProps) {
@@ -171,7 +171,7 @@
m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle());
m_renameInline->setChecked(GeneralSettings::renameInline());
m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView());
- m_closeFocusedSplitView->setChecked(GeneralSettings::closeFocusedSplitView());
+ m_closeActiveSplitView->setChecked(GeneralSettings::closeActiveSplitView());
loadSortingChoiceSettings();
}