From 2e588733c759cccd2d86e34a3a394b9a8ab0c800 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Thu, 28 Apr 2022 22:55:28 +0200 Subject: Improve naming consistency and leave mode on Escape --- src/kitemviews/kitemlistcontroller.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/kitemviews/kitemlistcontroller.cpp') diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index cc58ed06c..ce96cab6c 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -77,7 +77,7 @@ KItemListController::KItemListController(KItemModelBase* model, KItemListView* v m_longPressDetectionTimer->setInterval(QGuiApplication::styleHints()->mousePressAndHoldInterval()); connect(m_longPressDetectionTimer, &QTimer::timeout, this, [this]() { if (!m_selectionMode) { - Q_EMIT selectionModeRequested(); + Q_EMIT selectionModeChangeRequested(true); } }); @@ -232,7 +232,7 @@ bool KItemListController::singleClickActivationEnforced() const return m_singleClickActivationEnforced; } -void KItemListController::setSelectionMode(bool enabled) +void KItemListController::setSelectionModeEnabled(bool enabled) { m_selectionMode = enabled; } @@ -430,6 +430,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) } case Qt::Key_Escape: + if (m_selectionMode && m_selectionManager->selectedItems().count() < 1) { + Q_EMIT selectionModeChangeRequested(false); + } if (m_selectionBehavior != SingleSelection) { m_selectionManager->clearSelection(); } -- cgit v1.3