[kde-workspace/f19: 26/28] Revert "drop kde-workspace-4.10.5-kickoff-kbd-navigation.patch, it's included in 4.10.5"
Rex Dieter
rdieter at fedoraproject.org
Thu Sep 5 13:16:56 UTC 2013
commit 1b7cc61e0ba22dc040db91b453abc6b32f3a3f73
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Sep 5 08:16:09 2013 -0500
Revert "drop kde-workspace-4.10.5-kickoff-kbd-navigation.patch, it's included in 4.10.5"
This reverts commit bce740507d0d7131004822c648f556e667dae5b2.
kde-workspace-4.10.5-kickoff-kbd-navigation.patch | 46 +++++++++++++++++++++
kde-workspace.spec | 2 +
2 files changed, 48 insertions(+), 0 deletions(-)
---
diff --git a/kde-workspace-4.10.5-kickoff-kbd-navigation.patch b/kde-workspace-4.10.5-kickoff-kbd-navigation.patch
new file mode 100644
index 0000000..12862ad
--- /dev/null
+++ b/kde-workspace-4.10.5-kickoff-kbd-navigation.patch
@@ -0,0 +1,46 @@
+commit 07c25904c3aa504d221ea2f673db8bf1271eecce
+Author: Lukáš Tinkl <lukas at kde.org>
+Date: Fri Jun 14 21:56:24 2013 +0200
+
+ Up/Down keys should not move to the left view when on the first/last position
+
+ Tested the whole kickoff menu keyboard navigation, everything works as
+ expected now: Right key into the submenu, left key to the parent menu;
+ when in the toplevel, it moves to the view on the right/left
+ when pressing Right/Left arrow keys respectively
+
+ BUG: 310166
+
+diff --git a/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp b/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp
+index 1d48f5b..78af286 100644
+--- a/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp
++++ b/plasma/desktop/applets/kickoff/ui/flipscrollview.cpp
+@@ -309,9 +309,6 @@ QModelIndex FlipScrollView::moveCursor(CursorAction cursorAction, Qt::KeyboardMo
+ } else if (currentIndex().row() > 0) {
+ index = currentIndex().sibling(currentIndex().row() - 1,
+ currentIndex().column());
+- } else if (currentIndex().row() == 0) {
+- kDebug() << "we are in row 0, processing Key_Up";
+- emit focusNextViewLeft();
+ }
+ break;
+ case MoveDown:
+@@ -321,9 +318,6 @@ QModelIndex FlipScrollView::moveCursor(CursorAction cursorAction, Qt::KeyboardMo
+ model()->rowCount(currentIndex().parent()) - 1) {
+ index = currentIndex().sibling(currentIndex().row() + 1,
+ currentIndex().column());
+- } else {
+- kDebug() << "we are in Last row, processing Key_Down";
+- emit focusNextViewLeft();
+ }
+ break;
+ case MoveLeft:
+@@ -534,8 +528,6 @@ void FlipScrollView::paintEvent(QPaintEvent * event)
+ }
+ }
+
+- QRectF eventRect = event->rect();
+-
+ // draw navigation
+ QStyle::State state = 0;
+ if (currentRoot.isValid()) {
diff --git a/kde-workspace.spec b/kde-workspace.spec
index f9f2476..cd4c743 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -125,6 +125,7 @@ Patch62: kde-workspace-4.10.2-systemd-displaymanager.patch
## upstream patches
Patch100: kde-workspace-4.11-bz#921781-check-max-viewport-size.patch
Patch101: kde-workspace-4.10-bz#921742.patch
+Patch102: kde-workspace-4.10.5-kickoff-kbd-navigation.patch
## plasma active patches
@@ -479,6 +480,7 @@ Requires: akonadi
# upstream patches
%patch100 -p1 -b .bug921781
%patch101 -p1 -b .bug921742
+%patch102 -p1 -b .bug310166
# Fedora patches
%if 0%{?fedora} && 0%{?rhel} > 6
More information about the scm-commits
mailing list