Enable Ctrl/Shift-Click to open folder in a new tab/window

[dolphin.git] / src / kitemviews / kitemlistcontroller.cpp

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index 5c9a2bbdd35bf3acd51d683f5397db06e1c0015c..d0bcd6cebc9b82a733db1d2474cd09cbd5a2e6db 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -1550,8 +1550,9 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi
         return true;
     }
 
         return true;
     }
 

+    const bool controlPressed = modifiers & Qt::ControlModifier;

     const bool shiftOrControlPressed = modifiers & Qt::ShiftModifier ||
     const bool shiftOrControlPressed = modifiers & Qt::ShiftModifier ||

-                                       modifiers & Qt::ControlModifier;
+                                       controlPressed;

 
     KItemListRubberBand* rubberBand = m_view->rubberBand();
     if (rubberBand->isActive()) {
 
     KItemListRubberBand* rubberBand = m_view->rubberBand();
     if (rubberBand->isActive()) {


@@ -1582,8 +1583,9 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi
 
                 Q_EMIT itemExpansionToggleClicked(index);
                 emitItemActivated = false;
 
                 Q_EMIT itemExpansionToggleClicked(index);
                 emitItemActivated = false;

-            } else if (shiftOrControlPressed) {
-                // The mouse click should only update the selection, not trigger the item
+            } else if (shiftOrControlPressed && m_selectionBehavior != SingleSelection) {
+                // The mouse click should only update the selection, not trigger the item, except when
+                // we are in single selection mode

                 emitItemActivated = false;
             } else if (!(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced)) {
                 if (touch) {
                 emitItemActivated = false;
             } else if (!(m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick) || m_singleClickActivationEnforced)) {
                 if (touch) {