]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't enable two-clicks renaming in single-click mode
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 27 Oct 2018 14:53:59 +0000 (16:53 +0200)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Sat, 27 Oct 2018 14:58:33 +0000 (16:58 +0200)
Summary:
This was supposed to be part of commit 5454283008f2, but apparently we
didn't notice it was missing.

Test Plan:
- Enable single-click mode from system settings
- Select a file in dolphin
- Long-click the selected file and make sure inline renaming doesn't start

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D16460

src/views/dolphinview.cpp

index 1db62b8003040ab582c1a7d4e97a42fa735f5cb1..3bb71089f62b41964aac402b7b2e5f194775b48b 100644 (file)
@@ -1116,7 +1116,7 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons
 
 void DolphinView::slotSelectedItemTextPressed(int index)
 {
-    if (GeneralSettings::renameInline()) {
+    if (GeneralSettings::renameInline() && !m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) {
         const KFileItem item = m_model->fileItem(index);
         const KFileItemListProperties capabilities(KFileItemList() << item);
         if (capabilities.supportsMoving()) {