3 files changed, 93 insertions, 2 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index ca8253e8f5b6..a082817d00d1 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,9 +1,10 @@
 AUX plasma-desktop-5.12.5-submodules-update.patch 1016 BLAKE2B 7ff9a57181b1438027cdf2aaf0e5d6dad25125c79c9cdb349b1d4b271638f1fb77f0742b3d67060ad74f26a820765260796eacd8cd994263fc00fcb13b82ace0 SHA512 c283923a0f5473e6017b1160f3a15f7ec277196cc55b14c03bc77a56188b44c9d58010abfe85d1e6c2c25fdda1f3b35ea3bbe9525bbbd80c8ab82d6e28960a9a
 AUX plasma-desktop-5.13.5-activityswitcher.patch 2194 BLAKE2B 992d63a598b804f380a2d0f893f6d1295bc8e96f4afaff8472566f6c915e388542ed46cf183803687de04889e4d66cf63dc47c45d5ffabfa4b8e57cc7322587e SHA512 4431a3766e9faa6c2026ea73753691bf7f8d8d29c3e8dff67060772a9a2caaafa3bd760b19817874d411f6f4d275ea46abcb437460753b50edaf52dc4718a4a6
+AUX plasma-desktop-5.13.5-kickersearch-nav.patch 3897 BLAKE2B ca412633e3d09f924a03f26b0019e5967fea7a54e03f921c6ba23178cbb91f314094bffae28f97a96800379d723ad3db1e783a557d106a6a0a6e2cd4905e458d SHA512 c5e43ca565aeaa19bb8b5cf7307c60a1fdc2b1600552e4860a79fe261bf681a2954b44a3b34462e2b5164f7848b0f827ba21494022360eaa565a6675c2e6bd45
 DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
 DIST plasma-desktop-5.12.6.tar.xz 9172156 BLAKE2B 054045e1264926e5d0c87876c87cf48164a99c343f7c3fdb22dbae036cdc7e6fbb147c97c33a047c0a5c0cb75b62c88b802ccb79bcce022f9ccf9abeebde419b SHA512 435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76
 DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383
 EBUILD plasma-desktop-5.12.5-r1.ebuild 4495 BLAKE2B 51f2671d3e48f65707b28cf6eb29f6ff26e5e444e06e16ec918d40b803d4c247168f226000ad167530852ff27d721331c0a3d4cd6c3c1aee72e7fcb6fe953f41 SHA512 a2d9148faf259057b3e6b7746b804fd1ae6384714adb57b53f306246992541968faaf9d44acc22e4f4ae34c46068310d37ea3fb66457fe0e52a424c32c96f592
 EBUILD plasma-desktop-5.12.6.ebuild 4412 BLAKE2B 890435931325f175740024daebbdeb981061607c539e64b2bcf4bf51b3f929d35e219e08399875db12599c3fd6fa393efdc4e1b79912654deaba12172275a59c SHA512 aa47ac7390a855b6ae64ac663e060cd3b2a7b8421b760c3bf75695f0d35865310f96418956267785b09e32c6adbcc0e17d4e8a275b7a58bad934b4afd5a12057
-EBUILD plasma-desktop-5.13.5.ebuild 4520 BLAKE2B a5bf6c1a08b4869be3d132d29c6c7e18fd1424a2c5b35d3f184863ca59e1d0ea448260b982ae3116bde88102069e536eebe8eb928cf25f0a3b3e13450f55d2c4 SHA512 a6feaa6fccf00db7c5da3a3d3c46f2628ac598c8d0efbf7926ab322c633e009b0fc0b46662755fd78809aa565aa85b160cd83c6407ac36fe2b9974158fe8893d
+EBUILD plasma-desktop-5.13.5-r1.ebuild 4564 BLAKE2B 55a097db38f5d7c6cbcde5a47993c3ba356f451f6bad41ac70ddb0eef96b5223fd9293305a7b920e8c83edbf006063ae91cc6b9c03e25e77de6b2dbb7dedb3ba SHA512 d8f06624fcec7657efd69834dce3e442cf702a4ce12a4f0ac2ee42ddc45ae8353765c07c18d6b79cd333081fc7b2aff5f36140b8e83967ca915c66fc1d631714
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-kickersearch-nav.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-kickersearch-nav.patch
new file mode 100644
index 000000000000..75b5bc27b2ae
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-kickersearch-nav.patch
@@ -0,0 +1,87 @@
+From 1692ae244bc5229df78df2d5ba2e76418362cb50 Mon Sep 17 00:00:00 2001
+From: Eike Hein <hein@kde.org>
+Date: Wed, 5 Sep 2018 18:58:35 +0900
+Subject: Improve arrow key navigation of Kicker search results
+
+Summary:
+Kicker already makes sure the first search result is highlighted
+and actionable while searching. This patch makes arrow-down after
+typing move to the second search result instead of merely moving
+focus from the search field to the list, so the user doesn't have
+to press arrow-down twice anymore.
+
+It also allows using arrow-left/right to jump to the other result
+columns, when the cursor is at the start or end of the text field,
+respectively.
+
+BUG:397779
+
+Reviewers: ngraham
+
+Subscribers: plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D15286
+---
+ .../package/contents/ui/MenuRepresentation.qml       | 20 +++++++++++++++++++-
+ .../kicker/package/contents/ui/RunnerResultsList.qml |  1 +
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/applets/kicker/package/contents/ui/MenuRepresentation.qml b/applets/kicker/package/contents/ui/MenuRepresentation.qml
+index b70b76b..58cbf8d 100644
+--- a/applets/kicker/package/contents/ui/MenuRepresentation.qml
++++ b/applets/kicker/package/contents/ui/MenuRepresentation.qml
+@@ -393,7 +393,7 @@ FocusScope {
+             } else if (event.key == Qt.Key_Down) {
+                 if (rootList.visible) {
+                     rootList.showChildDialogs = false;
+-                    rootList.currentIndex = 0;
++                    rootList.currentIndex = Math.min(1, rootList.count);
+                     rootList.forceActiveFocus();
+                     rootList.showChildDialogs = true;
+                 }
+@@ -402,11 +402,29 @@ FocusScope {
+                     for (var i = 0; i < runnerModel.count; ++i) {
+                         if (runnerModel.modelForRow(i).count) {
+                             var targetList = runnerColumnsRepeater.itemAt(i);
++                            targetList.currentIndex = Math.min(1, targetList.count);
++                            targetList.forceActiveFocus();
++                            break;
++                        }
++                    }
++                }
++            } else if (event.key == Qt.Key_Left && cursorPosition == 0) {
++                    for (var i = runnerModel.count; i >= 0; --i) {
++                        if (runnerModel.modelForRow(i).count) {
++                            var targetList = runnerColumnsRepeater.itemAt(i);
+                             targetList.currentIndex = 0;
+                             targetList.forceActiveFocus();
+                             break;
+                         }
+                     }
++            } else if (event.key == Qt.Key_Right && cursorPosition == length) {
++                for (var i = 1; i < runnerModel.count; ++i) {
++                    if (runnerModel.modelForRow(i).count) {
++                        var targetList = runnerColumnsRepeater.itemAt(i);
++                        targetList.currentIndex = 0;
++                        targetList.forceActiveFocus();
++                        break;
++                    }
+                 }
+             } else if (event.key == Qt.Key_Enter || event.key == Qt.Key_Return) {
+                 if (runnerColumns.visible && runnerModel.modelForRow(0).count) {
+diff --git a/applets/kicker/package/contents/ui/RunnerResultsList.qml b/applets/kicker/package/contents/ui/RunnerResultsList.qml
+index 3627c2f..4e6dc2f 100644
+--- a/applets/kicker/package/contents/ui/RunnerResultsList.qml
++++ b/applets/kicker/package/contents/ui/RunnerResultsList.qml
+@@ -30,6 +30,7 @@ FocusScope {
+     signal keyNavigationAtListEnd
+ 
+     property alias currentIndex: runnerMatches.currentIndex
++    property alias count: runnerMatches.count
+     property alias containsMouse: runnerMatches.containsMouse
+ 
+     Accessible.name: header.text
+-- 
+cgit v0.11.2
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild
index 6074f6affe7a..06140e915b17 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5-r1.ebuild
@@ -124,7 +124,10 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-plasma/systemsettings:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-activityswitcher.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-activityswitcher.patch"
+	"${FILESDIR}/${P}-kickersearch-nav.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(