From e464b58c33b27ea331225778c60ba3aa8b7fb1d5 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Mon, 16 May 2022 15:53:18 +0200 Subject: Address Nate's UX feedback: Episode 2 - Make Esc leave selection mode and have it only clear selection when already outside selection mode. - Let translators know that the "More" overflow button should only have a short text on it. - Fix a crash that happened when any code tried to exit selection mode even though selection mode had never been enabled to begin with. --- src/kitemviews/kitemlistcontroller.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/kitemviews/kitemlistcontroller.cpp') diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index c86dfb582..2c407dbe2 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -430,10 +430,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) } case Qt::Key_Escape: - if (m_selectionMode && m_selectionManager->selectedItems().count() < 1) { + if (m_selectionMode) { Q_EMIT selectionModeChangeRequested(false); - } - if (m_selectionBehavior != SingleSelection) { + } else if (m_selectionBehavior != SingleSelection) { m_selectionManager->clearSelection(); } m_keyboardManager->cancelSearch(); -- cgit v1.3