┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kitemviews/kstandarditemlistview.cpp7
-rw-r--r--src/kitemviews/kstandarditemlistview.h2
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp1
-rw-r--r--src/settings/dolphin_detailsmodesettings.kcfg4
-rw-r--r--src/settings/viewmodes/viewsettingstab.cpp22
-rw-r--r--src/settings/viewmodes/viewsettingstab.h1
-rw-r--r--src/views/dolphinitemlistview.cpp7
-rw-r--r--src/views/dolphinitemlistview.h3
8 files changed, 45 insertions, 2 deletions
diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 4b7c2d9a4..0ba23e654 100644
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -36,7 +36,7 @@ void KStandardItemListView::setItemLayout(ItemLayout layout)
m_itemLayout = layout;
// keep the leading padding option unchanged here
- setHighlightEntireRow(layout == DetailsLayout);
+ setHighlightEntireRow(itemLayoutHighlightEntireRow(layout));
setSupportsItemExpanding(itemLayoutSupportsItemExpanding(layout));
setScrollOrientation(layout == CompactLayout ? Qt::Horizontal : Qt::Vertical);
@@ -93,6 +93,11 @@ bool KStandardItemListView::itemSizeHintUpdateRequired(const QSet<QByteArray>& c
return false;
}
+bool KStandardItemListView::itemLayoutHighlightEntireRow(ItemLayout layout) const
+{
+ return layout == DetailsLayout;
+}
+
bool KStandardItemListView::itemLayoutSupportsItemExpanding(ItemLayout layout) const
{
return layout == DetailsLayout;
diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h
index 7f0550ec3..527d14b9d 100644
--- a/src/kitemviews/kstandarditemlistview.h
+++ b/src/kitemviews/kstandarditemlistview.h
@@ -50,6 +50,8 @@ protected:
void initializeItemListWidget(KItemListWidget* item) override;
bool itemSizeHintUpdateRequired(const QSet<QByteArray>& changedRoles) const override;
virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const;
+ /** To be overriden by sub-classes to specify when full row highlighting should be enabled. */
+ virtual bool itemLayoutHighlightEntireRow(ItemLayout layout) const;
virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous);
void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) override;
void onSupportsItemExpandingChanged(bool supportsExpanding) override;
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 9a2939b23..67afbb248 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -241,6 +241,7 @@ KStandardItemListWidget::KStandardItemListWidget(KItemListWidgetInformant* infor
m_customizedFont(),
m_customizedFontMetrics(m_customizedFont),
m_isExpandable(false),
+ m_highlightEntireRow(false),
m_supportsItemExpanding(false),
m_dirtyLayout(true),
m_dirtyContent(true),
diff --git a/src/settings/dolphin_detailsmodesettings.kcfg b/src/settings/dolphin_detailsmodesettings.kcfg
index a58a8d00b..aad59743c 100644
--- a/src/settings/dolphin_detailsmodesettings.kcfg
+++ b/src/settings/dolphin_detailsmodesettings.kcfg
@@ -31,6 +31,10 @@
<label>Side Padding</label>
<default>20</default>
</entry>
+ <entry name="HighlightEntireRow" type="Bool">
+ <label>Highlight entire row</label>
+ <default>true</default>
+ </entry>
<entry name="ExpandableFolders" type="Bool">
<label>Expandable folders</label>
<default>true</default>
diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index cc6818a30..850004c6f 100644
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -101,6 +101,10 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable"));
topLayout->addRow(i18nc("@label:checkbox", "Folders:"), m_expandableFolders);
+ m_highlightEntireRow = new QCheckBox(i18nc("@option:check", "Highlight entire row"));
+ topLayout->addRow(i18nc("@label:checkbox", "Selection effect:"), m_highlightEntireRow);
+
+
#ifndef Q_OS_WIN
// Sorting properties
m_numberOfItems = new QRadioButton(i18nc("option:radio", "Number of items"));
@@ -161,6 +165,7 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
connect(m_widthBox, &QComboBox::currentIndexChanged, this, &ViewSettingsTab::changed);
break;
case DetailsMode:
+ connect(m_highlightEntireRow, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
#ifndef Q_OS_WIN
connect(m_recursiveDirectorySizeLimit, &QSpinBox::valueChanged, this, &ViewSettingsTab::changed);
@@ -195,6 +200,22 @@ void ViewSettingsTab::applySettings()
CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());
break;
case DetailsMode:
+ // We need side-padding when the full row is a click target to still be able to not click items.
+ // So here the default padding is enabled when the full row highlight is enabled.
+ if (m_highlightEntireRow->isChecked() && !DetailsModeSettings::highlightEntireRow()) {
+ auto detailsModeSettings = DetailsModeSettings::self();
+ const bool usedDefaults = detailsModeSettings->useDefaults(true);
+ const int defaultSidePadding = detailsModeSettings->sidePadding();
+ detailsModeSettings->useDefaults(usedDefaults);
+ if (DetailsModeSettings::sidePadding() < defaultSidePadding) {
+ DetailsModeSettings::setSidePadding(defaultSidePadding);
+ }
+ } else if (!m_highlightEntireRow->isChecked() && DetailsModeSettings::highlightEntireRow()) {
+ // The full row click target is disabled so now most of the view area can be used to interact
+ // with the view background. Having an extra side padding has no usability benefit in this case.
+ DetailsModeSettings::setSidePadding(0);
+ }
+ DetailsModeSettings::setHighlightEntireRow(m_highlightEntireRow->isChecked());
DetailsModeSettings::setExpandableFolders(m_expandableFolders->isChecked());
#ifndef Q_OS_WIN
DetailsModeSettings::setDirectorySizeCount(m_numberOfItems->isChecked());
@@ -238,6 +259,7 @@ void ViewSettingsTab::loadSettings()
m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());
break;
case DetailsMode:
+ m_highlightEntireRow->setChecked(DetailsModeSettings::highlightEntireRow());
m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());
#ifndef Q_OS_WIN
if (DetailsModeSettings::directorySizeCount()) {
diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index 36dde0583..2cc133b52 100644
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -56,6 +56,7 @@ private:
DolphinFontRequester* m_fontRequester;
QComboBox* m_widthBox;
QComboBox* m_maxLinesBox;
+ QCheckBox* m_highlightEntireRow;
QCheckBox* m_expandableFolders;
QRadioButton* m_numberOfItems;
QRadioButton* m_sizeOfContents;
diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index cd6dbd0a7..60d5577b8 100644
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -83,7 +83,7 @@ void DolphinItemListView::readSettings()
beginTransaction();
setEnabledSelectionToggles(m_selectionTogglesEnabled);
- setHighlightEntireRow(DetailsModeSettings::sidePadding());
+ setHighlightEntireRow(itemLayoutHighlightEntireRow(itemLayout()));
setSupportsItemExpanding(itemLayoutSupportsItemExpanding(itemLayout()));
updateFont();
@@ -107,6 +107,11 @@ KItemListWidgetCreatorBase* DolphinItemListView::defaultWidgetCreator() const
return new KItemListWidgetCreator<DolphinFileItemListWidget>();
}
+bool DolphinItemListView::itemLayoutHighlightEntireRow(ItemLayout layout) const
+{
+ return layout == DetailsLayout && DetailsModeSettings::highlightEntireRow();
+}
+
bool DolphinItemListView::itemLayoutSupportsItemExpanding(ItemLayout layout) const
{
return layout == DetailsLayout && DetailsModeSettings::expandableFolders();
diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index 464aec1b4..25476290f 100644
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -47,6 +47,9 @@ public:
protected:
KItemListWidgetCreatorBase* defaultWidgetCreator() const override;
+ /** Overwriting in the Dolphin-specific class because we want this to be user-configurable.
+ * @see KStandardItemListView::itemLayoutHighlightEntireRow */
+ bool itemLayoutHighlightEntireRow(ItemLayout layout) const override;
bool itemLayoutSupportsItemExpanding(ItemLayout layout) const override;
void onItemLayoutChanged(ItemLayout current, ItemLayout previous) override;
void onPreviewsShownChanged(bool shown) override;
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 07:00:19 +0000