In open/save dialog, we had no way to select items when using single-click mouse mode. (Except holding down control key).
This adds the same emblem that Dolphin uses for its selections.
It is shown in both treeviews and listviews, but only when single-click mode is active and the filewidget allows selecting multiple items.
BUG: 185793
FIXED-IN: 6.14
Gbp-Pq: Name upstream_d8441b7b_Show-single-click-selection-emblem-when-using-single-click-mouse-mode.patch
kdiroperatoriconview.cpp
kdirsortfilterproxymodel.cpp #used in combination with kdirmodel.cpp
kencodingfiledialog.cpp
+ kfileitemselectionemblem.cpp
kfilebookmarkhandler.cpp
kfilecopytomenu.cpp
kfilecustomdialog.cpp
#include "kdiroperatoriconview_p.h"
#include "kdirsortfilterproxymodel.h"
#include "kfileitem.h"
+#include "kfileitemselectionemblem.h"
#include "kfilemetapreview_p.h"
#include "knewfilemenu.h"
#include "kpreviewwidgetbase.h"
if (d->m_isTouchEvent) {
return true;
}
- if (d->m_preview && !d->m_preview->isHidden()) {
- const QModelIndex hoveredIndex = d->m_itemView->indexAt(d->m_itemView->viewport()->mapFromGlobal(QCursor::pos()));
+ const QModelIndex hoveredIndex = d->m_itemView->indexAt(d->m_itemView->viewport()->mapFromGlobal(QCursor::pos()));
+ if (hoveredIndex.isValid()) {
+ KFileItemSelectionEmblem(d->m_itemView, hoveredIndex, this).updateSelectionEmblemRectForIndex(iconSize());
+ }
+
+ if (d->m_preview && !d->m_preview->isHidden()) {
if (d->m_lastHoveredIndex == hoveredIndex) {
return QWidget::eventFilter(watched, event);
}
{
QAbstractItemView *itemView = nullptr;
if (KFile::isDetailView(viewKind) || KFile::isTreeView(viewKind) || KFile::isDetailTreeView(viewKind)) {
- KDirOperatorDetailView *detailView = new KDirOperatorDetailView(parent);
+ KDirOperatorDetailView *detailView = new KDirOperatorDetailView(this, parent);
detailView->setViewMode(viewKind);
itemView = detailView;
} else {
- itemView = new KDirOperatorIconView(parent, decorationPosition());
+ itemView = new KDirOperatorIconView(this, parent, decorationPosition());
}
return itemView;
*/
#include "kdiroperatordetailview_p.h"
+#include "kfileitemselectionemblem.h"
#include <kdirlister.h>
#include <kdirmodel.h>
#include <QMimeData>
#include <QScrollBar>
-KDirOperatorDetailView::KDirOperatorDetailView(QWidget *parent)
+KDirOperatorDetailView::KDirOperatorDetailView(KDirOperator *dirOperator, QWidget *parent)
: QTreeView(parent)
, m_hideDetailColumns(false)
+ , m_isEmblemClicked(false)
+ , m_dirOperator(dirOperator)
{
setRootIsDecorated(false);
setSortingEnabled(true);
void KDirOperatorDetailView::mousePressEvent(QMouseEvent *event)
{
+ const QModelIndex index = indexAt(event->pos());
+ // When selection emblem is clicked, select it and don't do anything else
+ m_isEmblemClicked = KFileItemSelectionEmblem(this, index, m_dirOperator).handleMousePressEvent(event->pos());
+ if (m_isEmblemClicked) {
+ return;
+ }
+
QTreeView::mousePressEvent(event);
- const QModelIndex index = indexAt(event->pos());
if (!index.isValid() || (index.column() != KDirModel::Name)) {
const Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers();
if (!(modifiers & Qt::ShiftModifier) && !(modifiers & Qt::ControlModifier)) {
}
}
+void KDirOperatorDetailView::mouseMoveEvent(QMouseEvent *event)
+{
+ // Disallow selection dragging when emblem is clicked
+ if (m_isEmblemClicked) {
+ return;
+ }
+ QTreeView::mouseMoveEvent(event);
+}
+
+void KDirOperatorDetailView::mouseReleaseEvent(QMouseEvent *event)
+{
+ // Reset the emblem selection
+ if (m_isEmblemClicked) {
+ m_isEmblemClicked = false;
+ }
+ QTreeView::mouseReleaseEvent(event);
+}
+
void KDirOperatorDetailView::currentChanged(const QModelIndex ¤t, const QModelIndex &previous)
{
QTreeView::currentChanged(current, previous);
#ifndef KDIROPERATORDETAILVIEW_P_H
#define KDIROPERATORDETAILVIEW_P_H
+#include <KDirOperator>
#include <QTreeView>
#include <kfile.h>
Q_OBJECT
public:
- explicit KDirOperatorDetailView(QWidget *parent = nullptr);
+ explicit KDirOperatorDetailView(KDirOperator *dirOperator, QWidget *parent = nullptr);
~KDirOperatorDetailView() override;
/**
bool event(QEvent *event) override;
void dragEnterEvent(QDragEnterEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override;
private:
bool m_hideDetailColumns;
+ bool m_isEmblemClicked;
+ KDirOperator *m_dirOperator;
};
#endif
*/
#include "kdiroperatoriconview_p.h"
+#include "kfileitemselectionemblem.h"
#include <QApplication>
#include <QDragEnterEvent>
#include <KFileItemDelegate>
#include <KIconLoader>
-KDirOperatorIconView::KDirOperatorIconView(QWidget *parent, QStyleOptionViewItem::Position aDecorationPosition)
+KDirOperatorIconView::KDirOperatorIconView(KDirOperator *dirOperator, QWidget *parent, QStyleOptionViewItem::Position aDecorationPosition)
: QListView(parent)
+ , m_isEmblemClicked(false)
+ , m_dirOperator(dirOperator)
{
setViewMode(QListView::IconMode);
setResizeMode(QListView::Adjust);
void KDirOperatorIconView::mousePressEvent(QMouseEvent *event)
{
- if (!indexAt(event->pos()).isValid()) {
+ const QModelIndex index = indexAt(event->pos());
+
+ // When selection emblem is clicked, select it and don't do anything else
+ m_isEmblemClicked = KFileItemSelectionEmblem(this, index, m_dirOperator).handleMousePressEvent(event->pos());
+ if (m_isEmblemClicked) {
+ return;
+ }
+
+ if (!index.isValid()) {
const Qt::KeyboardModifiers modifiers = QApplication::keyboardModifiers();
if (!(modifiers & Qt::ShiftModifier) && !(modifiers & Qt::ControlModifier)) {
clearSelection();
QListView::mousePressEvent(event);
}
+void KDirOperatorIconView::mouseMoveEvent(QMouseEvent *event)
+{
+ // Disallow selection dragging when emblem is clicked
+ if (m_isEmblemClicked) {
+ return;
+ }
+ QListView::mouseMoveEvent(event);
+}
+
+void KDirOperatorIconView::mouseReleaseEvent(QMouseEvent *event)
+{
+ // Reset the emblem selection
+ if (m_isEmblemClicked) {
+ m_isEmblemClicked = false;
+ }
+ QListView::mouseReleaseEvent(event);
+}
+
void KDirOperatorIconView::wheelEvent(QWheelEvent *event)
{
QListView::wheelEvent(event);
#ifndef KDIROPERATORICONVIEW_P_H
#define KDIROPERATORICONVIEW_P_H
+#include <KDirOperator>
#include <QListView>
/**
{
Q_OBJECT
public:
- KDirOperatorIconView(QWidget *parent = nullptr, QStyleOptionViewItem::Position decorationPosition = QStyleOptionViewItem::Position::Top);
+ KDirOperatorIconView(KDirOperator *dirOperator,
+ QWidget *parent = nullptr,
+ QStyleOptionViewItem::Position decorationPosition = QStyleOptionViewItem::Position::Top);
~KDirOperatorIconView() override;
void setDecorationPosition(QStyleOptionViewItem::Position decorationPosition);
void initViewItemOption(QStyleOptionViewItem *option) const override;
void dragEnterEvent(QDragEnterEvent *event) override;
void mousePressEvent(QMouseEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
void wheelEvent(QWheelEvent *event) override;
void resizeEvent(QResizeEvent *event) override;
private:
QStyleOptionViewItem::Position decorationPosition;
+ bool m_isEmblemClicked;
+ KDirOperator *m_dirOperator;
};
#endif // KDIROPERATORICONVIEW_P_H
--- /dev/null
+/*
+ SPDX-FileCopyrightText: 2025 Akseli Lahtinen <akselmo@akselmo.dev>
+
+ SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#include "kfileitemselectionemblem.h"
+#include "kfileitemdelegate.h"
+
+#include <QAbstractItemDelegate>
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QModelIndex>
+#include <QPoint>
+
+KFileItemSelectionEmblem::KFileItemSelectionEmblem(QAbstractItemView *itemView, QModelIndex index, KDirOperator *dirOperator)
+{
+ m_itemView = itemView;
+ m_index = index;
+ m_fileItemDelegate = fileItemDelegate();
+ m_dirOperator = dirOperator;
+ m_fileItem = m_fileItemDelegate->fileItem(m_index);
+}
+
+KFileItemSelectionEmblem::~KFileItemSelectionEmblem()
+{
+}
+
+bool KFileItemSelectionEmblem::isEmblemEnabled()
+{
+ if (m_itemView->selectionMode() == QAbstractItemView::ExtendedSelection && qApp->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) {
+ if (m_fileItem.isDir()) {
+ return m_dirOperator->isSelected(m_fileItem);
+ }
+ return true;
+ }
+ return false;
+}
+
+KFileItemDelegate *KFileItemSelectionEmblem::fileItemDelegate()
+{
+ auto itemDelegate = m_itemView->itemDelegateForIndex(m_index);
+ if (itemDelegate) {
+ return qobject_cast<KFileItemDelegate *>(itemDelegate);
+ }
+ return nullptr;
+}
+
+void KFileItemSelectionEmblem::updateSelectionEmblemRectForIndex(const int iconSize)
+{
+ if (isEmblemEnabled() && m_fileItemDelegate) {
+ m_fileItemDelegate->setSelectionEmblemRect(m_itemView->visualRect(m_index), iconSize);
+ }
+}
+
+bool KFileItemSelectionEmblem::handleMousePressEvent(const QPoint mousePos)
+{
+ if (isEmblemEnabled() && m_fileItemDelegate && m_fileItemDelegate->selectionEmblemRect().contains(mousePos)) {
+ m_itemView->selectionModel()->select(m_index, QItemSelectionModel::Toggle);
+ return true;
+ }
+ return false;
+}
--- /dev/null
+/*
+ SPDX-FileCopyrightText: 2025 Akseli Lahtinen <akselmo@akselmo.dev>
+
+ SPDX-License-Identifier: LGPL-2.0-or-later
+*/
+
+#ifndef KFILEITEMSELECTIONEMBLEM_H
+#define KFILEITEMSELECTIONEMBLEM_H
+
+#include <KDirOperator>
+#include <QAbstractItemView>
+#include <QModelIndex>
+
+class KFileItem;
+class KFileItemDelegate;
+class QPoint;
+
+class KFileItemSelectionEmblem
+{
+public:
+ KFileItemSelectionEmblem(QAbstractItemView *itemView, QModelIndex index, KDirOperator *dirOperator);
+ ~KFileItemSelectionEmblem();
+
+ void updateSelectionEmblemRectForIndex(const int iconSize);
+ bool handleMousePressEvent(const QPoint mousePos);
+ bool isEmblemEnabled();
+
+private:
+ KFileItemDelegate *fileItemDelegate();
+
+ QAbstractItemView *m_itemView;
+ QModelIndex m_index;
+ KDirOperator *m_dirOperator;
+ KFileItemDelegate *m_fileItemDelegate;
+ KFileItem m_fileItem;
+ bool m_isDir;
+};
+
+#endif
void gotNewIcon(const QModelIndex &index);
void paintJobTransfers(QPainter *painter, const qreal &jobAnimationAngle, const QPoint &iconPos, const QStyleOptionViewItem &opt);
+ int scaledEmblemSize(int iconSize) const;
public:
KFileItemDelegate::InformationList informationList;
QTextOption::WrapMode wrapMode;
bool jobTransfersVisible;
QIcon downArrowIcon;
+ QRect emblemRect;
private:
KIO::DelegateAnimationHandler *animationHandler;
, showToolTipWhenElided(true)
, wrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere)
, jobTransfersVisible(false)
+ , emblemRect(QRect())
, animationHandler(new KIO::DelegateAnimationHandler(parent))
, activeMargins(nullptr)
{
QPixmap icon = opt.icon.pixmap(opt.decorationSize, iconMode, iconState);
const KFileItem fileItem = d->fileItem(index);
+ const bool isDir = fileItem.isDir();
if (fileItem.isHidden()) {
KIconEffect::semiTransparent(icon);
}
pixmap = d->transition(fadeFromPixmap, pixmap, state->fadeProgress());
}
painter->drawPixmap(option.rect.topLeft(), pixmap);
+ drawSelectionEmblem(option, painter, index);
if (d->jobTransfersVisible && index.column() == 0) {
if (index.data(KDirModel::HasJobRole).toBool()) {
d->paintJobTransfers(painter, state->jobAnimationAngle(), iconPos, opt);
p.setRenderHint(QPainter::Antialiasing);
style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, &p, opt.widget);
p.drawPixmap(iconPos, icon);
+ drawSelectionEmblem(option, painter, index);
d->drawTextItems(&p, labelLayout, labelColor, infoLayout, infoColor, textBoundingRect);
d->drawFocusRect(&p, opt, focusRect);
p.end();
p.setRenderHint(QPainter::Antialiasing);
style->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, &p, opt.widget);
p.drawPixmap(iconPos, icon);
+ drawSelectionEmblem(option, painter, index);
d->drawTextItems(&p, labelLayout, labelColor, infoLayout, infoColor, textBoundingRect);
d->drawFocusRect(&p, opt, focusRect);
p.end();
}
painter->drawPixmap(option.rect.topLeft(), pixmap);
+ drawSelectionEmblem(option, painter, index);
painter->setRenderHint(QPainter::Antialiasing);
if (d->jobTransfersVisible && index.column() == 0) {
if (index.data(KDirModel::HasJobRole).toBool()) {
d->drawTextItems(painter, labelLayout, labelColor, infoLayout, infoColor, textBoundingRect);
d->drawFocusRect(painter, opt, focusRect);
+ drawSelectionEmblem(option, painter, index);
if (d->jobTransfersVisible && index.column() == 0 && state) {
if (index.data(KDirModel::HasJobRole).toBool()) {
painter->restore();
}
+void KFileItemDelegate::drawSelectionEmblem(QStyleOptionViewItem option, QPainter *painter, const QModelIndex &index) const
+{
+ if (index.column() != 0 || !qApp->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) {
+ return;
+ }
+ const auto state = option.state;
+ if ((state & QStyle::State_MouseOver && !fileItem(index).isDir()) || (state & QStyle::State_Selected)) {
+ const QString selectionEmblem = state & QStyle::State_Selected ? QStringLiteral("emblem-remove") : QStringLiteral("emblem-added");
+ const auto emblem = QIcon::fromTheme(selectionEmblem).pixmap(d->emblemRect.size(), state & QStyle::State_MouseOver ? QIcon::Active : QIcon::Disabled);
+
+ painter->drawPixmap(d->emblemRect.topLeft(), emblem);
+ }
+}
+
+int KFileItemDelegate::Private::scaledEmblemSize(int iconSize) const
+{
+ if (iconSize <= KIconLoader::SizeSmallMedium) {
+ return KIconLoader::SizeSmall;
+ } else if (iconSize <= KIconLoader::SizeHuge) {
+ return KIconLoader::SizeSmallMedium;
+ } else if (iconSize <= KIconLoader::SizeEnormous) {
+ return KIconLoader::SizeMedium;
+ }
+
+ return KIconLoader::SizeHuge;
+}
+
QWidget *KFileItemDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
QStyleOptionViewItem opt(option);
} // switch (event->type())
}
+void KFileItemDelegate::setSelectionEmblemRect(QRect rect, int iconSize)
+{
+ const auto emblemSize = d->scaledEmblemSize(iconSize);
+
+ // With small icons, try to center the emblem on top of the icon
+ if (iconSize <= KIconLoader::SizeSmallMedium) {
+ d->emblemRect = QRect(rect.topLeft().x() + emblemSize / 4, rect.topLeft().y() + emblemSize / 4, emblemSize, emblemSize);
+ } else {
+ d->emblemRect = QRect(rect.topLeft().x(), rect.topLeft().y(), emblemSize, emblemSize);
+ }
+}
+
+QRect KFileItemDelegate::selectionEmblemRect() const
+{
+ return d->emblemRect;
+}
+
+KFileItem KFileItemDelegate::fileItem(const QModelIndex &index) const
+{
+ return d->fileItem(index);
+}
+
#include "moc_kfileitemdelegate.cpp"
#define KFILEITEMDELEGATE_H
#include "kiowidgets_export.h"
+#include <KFileItem>
#include <QAbstractItemDelegate>
#include <QTextOption>
*/
bool eventFilter(QObject *object, QEvent *event) override;
+ /**
+ * @return The rectangle where selectionEmblem is being drawn
+ */
+ QRect selectionEmblemRect() const;
+
+ /**
+ * Set the rectangle where selectionEmblem should be drawn in.
+ */
+ void setSelectionEmblemRect(QRect rect, int iconSize);
+
+ KFileItem fileItem(const QModelIndex &index) const;
+
public Q_SLOTS:
/**
* Reimplemented from @ref QAbstractItemDelegate.
class Private;
std::unique_ptr<Private> const d; /// @internal
Q_DISABLE_COPY(KFileItemDelegate)
+
+ void drawSelectionEmblem(QStyleOptionViewItem option, QPainter *painter, const QModelIndex &index) const;
};
#endif // KFILEITEMDELEGATE_H