diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -990,6 +990,8 @@ } if (newHoveredWidget) { + newHoveredWidget->setEnabledSelectionToggle(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced); + newHoveredWidget->setHovered(true); const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos); newHoveredWidget->setHoverPosition(mappedPos); diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -2012,7 +2012,7 @@ } widget->setSelected(selectionManager->isSelected(index)); widget->setHovered(false); - widget->setEnabledSelectionToggle(enabledSelectionToggles()); + widget->setEnabledSelectionToggle(style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)); widget->setIndex(index); widget->setData(m_model->data(index)); widget->setSiblingsInformation(QBitArray()); 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 @@ -62,10 +62,6 @@ true - - - true - false 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 @@ -59,7 +59,6 @@ QCheckBox* m_showToolTips; QLabel* m_configureToolTips; - QCheckBox* m_showSelectionToggle; QRadioButton* m_naturalSorting; QRadioButton* m_caseSensitiveSorting; 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 @@ -35,7 +35,6 @@ m_localViewProps(nullptr), m_globalViewProps(nullptr), m_showToolTips(nullptr), - m_showSelectionToggle(nullptr), m_naturalSorting(nullptr), m_caseSensitiveSorting(nullptr), m_caseInsensitiveSorting(nullptr), @@ -71,9 +70,6 @@ // 'Show tooltips' m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this); - // 'Show selection marker' - m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this); - // 'Inline renaming of items' m_renameInline = new QCheckBox(i18nc("option:check", "Rename inline"), this); @@ -83,7 +79,6 @@ topLayout->addWidget(viewPropsBox); topLayout->addWidget(sortingPropsBox); topLayout->addWidget(m_showToolTips); - topLayout->addWidget(m_showSelectionToggle); topLayout->addWidget(m_renameInline); topLayout->addWidget(m_useTabForSplitViewSwitch); topLayout->addStretch(); @@ -93,7 +88,6 @@ connect(m_localViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); connect(m_globalViewProps, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); connect(m_showToolTips, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); - connect(m_showSelectionToggle, &QCheckBox::toggled, this, &BehaviorSettingsPage::changed); connect(m_naturalSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); connect(m_caseInsensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); connect(m_caseSensitiveSorting, &QRadioButton::toggled, this, &BehaviorSettingsPage::changed); @@ -113,7 +107,6 @@ const bool useGlobalViewProps = m_globalViewProps->isChecked(); settings->setGlobalViewProps(useGlobalViewProps); settings->setShowToolTips(m_showToolTips->isChecked()); - settings->setShowSelectionToggle(m_showSelectionToggle->isChecked()); setSortingChoiceValue(settings); settings->setRenameInline(m_renameInline->isChecked()); settings->setUseTabForSwitchingSplitView(m_useTabForSplitViewSwitch->isChecked()); @@ -144,7 +137,6 @@ m_globalViewProps->setChecked(useGlobalViewProps); m_showToolTips->setChecked(GeneralSettings::showToolTips()); - m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle()); m_renameInline->setChecked(GeneralSettings::renameInline()); m_useTabForSplitViewSwitch->setChecked(GeneralSettings::useTabForSwitchingSplitView()); diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp --- a/src/views/dolphinitemlistview.cpp +++ b/src/views/dolphinitemlistview.cpp @@ -83,7 +83,6 @@ beginTransaction(); - setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); setSupportsItemExpanding(itemLayoutSupportsItemExpanding(itemLayout())); updateFont(); diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -113,7 +113,7 @@ m_model = new KFileItemModel(this); m_view = new DolphinItemListView(); - m_view->setEnabledSelectionToggles(GeneralSettings::showSelectionToggle()); + m_view->setEnabledSelectionToggles(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)); m_view->setVisibleRoles({"text"}); applyModeToView();