summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-01-27 09:01:13 +0000
committerJohannes Huber <johu@gentoo.org>2012-01-27 09:01:13 +0000
commit37392606799ac92833dddbbbe957acd83de961f3 (patch)
treed8f9a1ce45f6088b3a20c108f0d9bd9523f573c7 /kde-base/dolphin/files
parentx86 stable per bug 400013 (diff)
downloadgentoo-2-37392606799ac92833dddbbbe957acd83de961f3.tar.gz
gentoo-2-37392606799ac92833dddbbbe957acd83de961f3.tar.bz2
gentoo-2-37392606799ac92833dddbbbe957acd83de961f3.zip
Add upstream patch which fixes selection behaviour with ctrl/shift key.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/dolphin/files')
-rw-r--r--kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch b/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch
new file mode 100644
index 000000000000..4e194e8863e5
--- /dev/null
+++ b/kde-base/dolphin/files/dolphin-4.8.0-fix-selection.patch
@@ -0,0 +1,23 @@
+commit 84a9cc4bf6e9decc4c102102c4b04162369eb0fe
+Author: Frank Reininghaus <frank78ac@googlemail.com>
+Date: Mon Jan 23 19:28:21 2012 +0100
+
+ Make sure that Control+click toggles the selection state
+
+ This commit fixes a regression caused by the recent commit
+ 9f711b5f2e1d1fd856cd6b033e6adb96f9b46d8a.
+ BUG: 292250
+
+diff --git a/dolphin/src/kitemviews/kitemlistcontroller.cpp b/dolphin/src/kitemviews/kitemlistcontroller.cpp
+index 0f22d70..560d160 100644
+--- a/dolphin/src/kitemviews/kitemlistcontroller.cpp
++++ b/dolphin/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.