[kde-baseapps] fix kde#292250, make sure that Control+click toggles the selection state
Than Ngo
than at fedoraproject.org
Wed Jan 25 16:19:05 UTC 2012
commit 8af038ae52722f08baffe427dc7e3760670c534c
Author: Than Ngo <than at redhat.com>
Date: Wed Jan 25 17:18:57 2012 +0100
fix kde#292250, make sure that Control+click toggles the selection state
kde-baseapps-4.8.0-kde#292250.patch | 12 ++++++++++++
kde-baseapps.spec | 10 ++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/kde-baseapps-4.8.0-kde#292250.patch b/kde-baseapps-4.8.0-kde#292250.patch
new file mode 100644
index 0000000..5fb3687
--- /dev/null
+++ b/kde-baseapps-4.8.0-kde#292250.patch
@@ -0,0 +1,12 @@
+diff -up kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.cpp.me kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.cpp
+--- kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.cpp.me 2012-01-25 17:14:18.000000000 +0100
++++ kde-baseapps-4.8.0/dolphin/src/kitemviews/kitemlistcontroller.cpp 2012-01-25 17:14:49.000000000 +0100
+@@ -471,7 +471,7 @@ bool KItemListController::mousePressEven
+ (!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.
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index fb09770..f0786e5 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -1,7 +1,7 @@
Name: kde-baseapps
Summary: KDE Core Applications
Version: 4.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: https://projects.kde.org/projects/kde/kde-baseapps
@@ -28,6 +28,9 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
Patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
## upstream patches
+# http://bugs.kde.org/292250, While holding Ctrl, clicking an item
+# to unselect it clears the selection
+Patch100: kde-baseapps-4.8.0-kde#292250.patch
%ifnarch s390 s390x
Requires: eject
@@ -113,7 +116,7 @@ Requires: kdelibs4-devel kdepimlibs4-devel
%patch2 -p2 -b .home-icon
%patch3 -p2 -b .kde#228593
%patch4 -p2 -b .bz#631481
-
+%patch100 -p1 -b .kde#292250
%build
mkdir -p %{_target_platform}
@@ -264,6 +267,9 @@ fi
%changelog
+* Wed Jan 25 2012 Than Ngo <than at redhat.com> - 4.8.0-2
+- fix kde#292250, make sure that Control+click toggles the selection state
+
* Fri Jan 20 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.0-1
- 4.8.0
More information about the scm-commits
mailing list