1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587
|
From d8441b7b5b2c8ebda18f5bde01f77ae802f4f48e Mon Sep 17 00:00:00 2001
From: Akseli Lahtinen <akselmo@akselmo.dev>
Date: Wed, 9 Apr 2025 07:57:20 +0000
Subject: [PATCH] Show single-click selection emblem when using single-click
mouse mode
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
---
src/filewidgets/CMakeLists.txt | 1 +
src/filewidgets/kdiroperator.cpp | 13 ++--
src/filewidgets/kdiroperatordetailview.cpp | 31 +++++++++-
src/filewidgets/kdiroperatordetailview_p.h | 7 ++-
src/filewidgets/kdiroperatoriconview.cpp | 33 +++++++++-
src/filewidgets/kdiroperatoriconview_p.h | 9 ++-
src/filewidgets/kfileitemselectionemblem.cpp | 63 ++++++++++++++++++++
src/filewidgets/kfileitemselectionemblem.h | 39 ++++++++++++
src/widgets/kfileitemdelegate.cpp | 58 ++++++++++++++++++
src/widgets/kfileitemdelegate.h | 15 +++++
10 files changed, 259 insertions(+), 10 deletions(-)
create mode 100644 src/filewidgets/kfileitemselectionemblem.cpp
create mode 100644 src/filewidgets/kfileitemselectionemblem.h
diff --git a/src/filewidgets/CMakeLists.txt b/src/filewidgets/CMakeLists.txt
index e5fc87f75..cf4520191 100644
--- a/src/filewidgets/CMakeLists.txt
+++ b/src/filewidgets/CMakeLists.txt
@@ -22,6 +22,7 @@ target_sources(KF6KIOFileWidgets PRIVATE
kdiroperatoriconview.cpp
kdirsortfilterproxymodel.cpp #used in combination with kdirmodel.cpp
kencodingfiledialog.cpp
+ kfileitemselectionemblem.cpp
kfilebookmarkhandler.cpp
kfilecopytomenu.cpp
kfilecustomdialog.cpp
diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
index d2d8a5513..e1d3afeea 100644
--- a/src/filewidgets/kdiroperator.cpp
+++ b/src/filewidgets/kdiroperator.cpp
@@ -17,6 +17,7 @@
#include "kdiroperatoriconview_p.h"
#include "kdirsortfilterproxymodel.h"
#include "kfileitem.h"
+#include "kfileitemselectionemblem.h"
#include "kfilemetapreview_p.h"
#include "knewfilemenu.h"
#include "kpreviewwidgetbase.h"
@@ -1260,9 +1261,13 @@ bool KDirOperator::eventFilter(QObject *watched, QEvent *event)
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);
}
@@ -1510,11 +1515,11 @@ QAbstractItemView *KDirOperator::createView(QWidget *parent, KFile::FileView vie
{
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;
diff --git a/src/filewidgets/kdiroperatordetailview.cpp b/src/filewidgets/kdiroperatordetailview.cpp
index 8bbd3e42c..b693e6d9d 100644
--- a/src/filewidgets/kdiroperatordetailview.cpp
+++ b/src/filewidgets/kdiroperatordetailview.cpp
@@ -5,6 +5,7 @@
*/
#include "kdiroperatordetailview_p.h"
+#include "kfileitemselectionemblem.h"
#include <kdirlister.h>
#include <kdirmodel.h>
@@ -17,9 +18,11 @@
#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);
@@ -115,9 +118,15 @@ void KDirOperatorDetailView::dragEnterEvent(QDragEnterEvent *event)
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)) {
@@ -126,6 +135,24 @@ void KDirOperatorDetailView::mousePressEvent(QMouseEvent *event)
}
}
+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);
diff --git a/src/filewidgets/kdiroperatordetailview_p.h b/src/filewidgets/kdiroperatordetailview_p.h
index f30ab9482..df45142d4 100644
--- a/src/filewidgets/kdiroperatordetailview_p.h
+++ b/src/filewidgets/kdiroperatordetailview_p.h
@@ -7,6 +7,7 @@
#ifndef KDIROPERATORDETAILVIEW_P_H
#define KDIROPERATORDETAILVIEW_P_H
+#include <KDirOperator>
#include <QTreeView>
#include <kfile.h>
@@ -22,7 +23,7 @@ class KDirOperatorDetailView : public QTreeView
Q_OBJECT
public:
- explicit KDirOperatorDetailView(QWidget *parent = nullptr);
+ explicit KDirOperatorDetailView(KDirOperator *dirOperator, QWidget *parent = nullptr);
~KDirOperatorDetailView() override;
/**
@@ -36,10 +37,14 @@ protected:
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
diff --git a/src/filewidgets/kdiroperatoriconview.cpp b/src/filewidgets/kdiroperatoriconview.cpp
index ace0c0098..9180ea1ed 100644
--- a/src/filewidgets/kdiroperatoriconview.cpp
+++ b/src/filewidgets/kdiroperatoriconview.cpp
@@ -6,6 +6,7 @@
*/
#include "kdiroperatoriconview_p.h"
+#include "kfileitemselectionemblem.h"
#include <QApplication>
#include <QDragEnterEvent>
@@ -15,8 +16,10 @@
#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);
@@ -74,7 +77,15 @@ void KDirOperatorIconView::dragEnterEvent(QDragEnterEvent *event)
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();
@@ -84,6 +95,24 @@ void KDirOperatorIconView::mousePressEvent(QMouseEvent *event)
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);
diff --git a/src/filewidgets/kdiroperatoriconview_p.h b/src/filewidgets/kdiroperatoriconview_p.h
index c4ab96738..f1caba9e0 100644
--- a/src/filewidgets/kdiroperatoriconview_p.h
+++ b/src/filewidgets/kdiroperatoriconview_p.h
@@ -8,6 +8,7 @@
#ifndef KDIROPERATORICONVIEW_P_H
#define KDIROPERATORICONVIEW_P_H
+#include <KDirOperator>
#include <QListView>
/**
@@ -18,7 +19,9 @@ class KDirOperatorIconView : public 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);
@@ -26,6 +29,8 @@ protected:
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;
@@ -34,6 +39,8 @@ protected
private:
QStyleOptionViewItem::Position decorationPosition;
+ bool m_isEmblemClicked;
+ KDirOperator *m_dirOperator;
};
#endif // KDIROPERATORICONVIEW_P_H
diff --git a/src/filewidgets/kfileitemselectionemblem.cpp b/src/filewidgets/kfileitemselectionemblem.cpp
new file mode 100644
index 000000000..566dee306
--- /dev/null
+++ b/src/filewidgets/kfileitemselectionemblem.cpp
@@ -0,0 +1,63 @@
+/*
+ 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;
+}
diff --git a/src/filewidgets/kfileitemselectionemblem.h b/src/filewidgets/kfileitemselectionemblem.h
new file mode 100644
index 000000000..4bfd78a8b
--- /dev/null
+++ b/src/filewidgets/kfileitemselectionemblem.h
@@ -0,0 +1,39 @@
+/*
+ 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
diff --git a/src/widgets/kfileitemdelegate.cpp b/src/widgets/kfileitemdelegate.cpp
index c00c69523..83acd9910 100644
--- a/src/widgets/kfileitemdelegate.cpp
+++ b/src/widgets/kfileitemdelegate.cpp
@@ -101,6 +101,7 @@ public:
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;
@@ -112,6 +113,7 @@ public:
QTextOption::WrapMode wrapMode;
bool jobTransfersVisible;
QIcon downArrowIcon;
+ QRect emblemRect;
private:
KIO::DelegateAnimationHandler *animationHandler;
@@ -128,6 +130,7 @@ KFileItemDelegate::Private::Private(KFileItemDelegate *parent)
, showToolTipWhenElided(true)
, wrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere)
, jobTransfersVisible(false)
+ , emblemRect(QRect())
, animationHandler(new KIO::DelegateAnimationHandler(parent))
, activeMargins(nullptr)
{
@@ -1153,6 +1156,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
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);
}
@@ -1176,6 +1180,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
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);
@@ -1251,6 +1256,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &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();
@@ -1263,6 +1269,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &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();
@@ -1282,6 +1289,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
}
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()) {
@@ -1306,6 +1314,7 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
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()) {
@@ -1315,6 +1324,33 @@ void KFileItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opt
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);
@@ -1551,4 +1587,26 @@ bool KFileItemDelegate::eventFilter(QObject *object, QEvent *event)
} // 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"
diff --git a/src/widgets/kfileitemdelegate.h b/src/widgets/kfileitemdelegate.h
index b4dd7eb05..83ecfe405 100644
--- a/src/widgets/kfileitemdelegate.h
+++ b/src/widgets/kfileitemdelegate.h
@@ -9,6 +9,7 @@
#define KFILEITEMDELEGATE_H
#include "kiowidgets_export.h"
+#include <KFileItem>
#include <QAbstractItemDelegate>
#include <QTextOption>
@@ -398,6 +399,18 @@ public:
*/
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.
@@ -414,6 +427,8 @@ private:
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
--
GitLab
|