From: Frank Reininghaus Date: Mon, 23 Jan 2012 18:28:21 +0000 (+0100) Subject: Make sure that Control+click toggles the selection state X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/fbb73966b2bd4158472d977914a134818f9cfd55?ds=sidebyside Make sure that Control+click toggles the selection state This commit fixes a regression caused by the recent commit 9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a. CCBUG: 292250 (cherry picked from commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe) --- diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 0f22d70bb..560d16042 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -471,7 +471,7 @@ bool KItemListController::mousePressEvent(QGraphicsSceneMouseEvent* event, const (!shiftOrControlPressed && !pressedItemAlreadySelected); if (clearSelection) { m_selectionManager->clearSelection(); - } else if (pressedItemAlreadySelected && (event->buttons() & Qt::LeftButton)) { + } else if (pressedItemAlreadySelected && !shiftOrControlPressed && (event->buttons() & Qt::LeftButton)) { // The user might want to start dragging multiple items, but if he clicks the item // in order to trigger it instead, the other selected items must be deselected. // However, we do not know yet what the user is going to do.