1 |
commit: c238ad1a982cc26cc3a8aef14a8ee6d2b2adfe4b |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 4 12:13:22 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 4 12:25:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c238ad1a |
7 |
|
8 |
kde-plasma/plasma-desktop: Fix activity switcher autohide |
9 |
|
10 |
Closes: https://bugs.gentoo.org/663032 |
11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
12 |
|
13 |
.../plasma-desktop-5.13.5-activityswitcher.patch | 62 ++++++++++++++++++++++ |
14 |
.../plasma-desktop/plasma-desktop-5.13.5.ebuild | 2 + |
15 |
2 files changed, 64 insertions(+) |
16 |
|
17 |
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..a495b075ca6 |
20 |
--- /dev/null |
21 |
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch |
22 |
@@ -0,0 +1,62 @@ |
23 |
+From c1f3b45cabe0cf89e13a5b1c9b7a673992320826 Mon Sep 17 00:00:00 2001 |
24 |
+From: Thomas Surrel <thomas.surrel@××××××××××.com> |
25 |
+Date: Tue, 22 May 2018 14:20:25 -0600 |
26 |
+Subject: Activity switcher auto-hide when using Meta-Tab |
27 |
+ |
28 |
+Summary: |
29 |
+Commit 174aa217180434ab93b899d9c7cf967bd2daff7e created a new |
30 |
+issue where the activity switcher would not hide anymore when |
31 |
+switching activities with the Meta-Tab global shortcut and |
32 |
+releasing the keys under one second. |
33 |
+ |
34 |
+This patch fixes this by unconditionnal toggling the activity |
35 |
+switcher visibility if it should be hidden, but keeping the |
36 |
+timestamp condition before showing it, so that both Meta-q and |
37 |
+Meta-Tab behaves correctly. |
38 |
+ |
39 |
+BUG: 393912 |
40 |
+ |
41 |
+Reviewers: mart, ngraham |
42 |
+ |
43 |
+Reviewed By: mart, ngraham |
44 |
+ |
45 |
+Subscribers: ngraham, plasma-devel |
46 |
+ |
47 |
+Tags: #plasma |
48 |
+ |
49 |
+Differential Revision: https://phabricator.kde.org/D13012 |
50 |
+--- |
51 |
+ desktoppackage/contents/views/Desktop.qml | 13 ++++++------- |
52 |
+ 1 file changed, 6 insertions(+), 7 deletions(-) |
53 |
+ |
54 |
+diff --git a/desktoppackage/contents/views/Desktop.qml b/desktoppackage/contents/views/Desktop.qml |
55 |
+index 3272a89..3539050 100644 |
56 |
+--- a/desktoppackage/contents/views/Desktop.qml |
57 |
++++ b/desktoppackage/contents/views/Desktop.qml |
58 |
+@@ -73,17 +73,16 @@ Item { |
59 |
+ property int lastToggleActivityManagerTimestamp: 0 |
60 |
+ |
61 |
+ function toggleActivityManager() { |
62 |
+- var currentTimestamp = new Date().getTime() / 1000; |
63 |
++ if (sidePanelStack.state == "activityManager") { |
64 |
++ sidePanelStack.state = "closed"; |
65 |
++ } else { |
66 |
++ var currentTimestamp = new Date().getTime() / 1000; |
67 |
+ |
68 |
+- if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) { |
69 |
+- if (sidePanelStack.state == "activityManager") { |
70 |
+- sidePanelStack.state = "closed"; |
71 |
+- } else { |
72 |
++ if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) { |
73 |
+ sidePanelStack.state = "activityManager"; |
74 |
+ sidePanelStack.setSource(Qt.resolvedUrl("../activitymanager/ActivityManager.qml")) |
75 |
++ lastToggleActivityManagerTimestamp = currentTimestamp; |
76 |
+ } |
77 |
+- |
78 |
+- lastToggleActivityManagerTimestamp = currentTimestamp; |
79 |
+ } |
80 |
+ } |
81 |
+ |
82 |
+-- |
83 |
+cgit v0.11.2 |
84 |
+ |
85 |
|
86 |
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild |
87 |
index 649e0d876dc..6074f6affe7 100644 |
88 |
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild |
89 |
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild |
90 |
@@ -124,6 +124,8 @@ RDEPEND="${COMMON_DEPEND} |
91 |
!kde-plasma/systemsettings:4 |
92 |
" |
93 |
|
94 |
+PATCHES=( "${FILESDIR}/${P}-activityswitcher.patch" ) |
95 |
+ |
96 |
src_configure() { |
97 |
local mycmakeargs=( |
98 |
$(cmake-utils_use_find_package appstream AppStreamQt) |