diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-01-20 12:04:23 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-01-20 14:24:14 +0100 |
| commit | cacd874af64e05e5ea6c27086ed0d9fffb2abc17 (patch) | |
| tree | d55a7ec84d81718e50897abcbbde08391d1e8601 /kde-frameworks/plasma/files | |
| parent | dev-python/ujson: Stabilize 5.0.0 arm64, #831545 (diff) | |
| download | gentoo-cacd874af64e05e5ea6c27086ed0d9fffb2abc17.tar.gz gentoo-cacd874af64e05e5ea6c27086ed0d9fffb2abc17.tar.bz2 gentoo-cacd874af64e05e5ea6c27086ed0d9fffb2abc17.zip | |
kde-frameworks/plasma: Fix Kickoff context menu missing option(s)
Upstream commit e9ba0c54f2c01bb530370c16502cf304fc18b3f6
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=448590
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/plasma/files')
| -rw-r--r-- | kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch new file mode 100644 index 000000000000..4bbb7a8ce1b0 --- /dev/null +++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch @@ -0,0 +1,32 @@ +From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001 +From: Alexander Lohnau <alexander.lohnau@gmx.de> +Date: Mon, 17 Jan 2022 19:58:53 +0100 +Subject: [PATCH] Corona::containmentForScreen: Ignore activities when an empty + string is used + +With the other overloads being deprecated, consumers are forced to put in an empty string +for the activity. As one can see in the pre-existing code, an empty string indicates +that the activity should be ignored. Consequently we should skip the activity check, when +we got an empty string. + +BUG: 448590 +--- + src/plasma/corona.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp +index f034d7b2e..8f532d690 100644 +--- a/src/plasma/corona.cpp ++++ b/src/plasma/corona.cpp +@@ -206,7 +206,7 @@ Containment *Corona::containmentForScreen(int screen, const QString &activity, c + for (Containment *cont : std::as_const(d->containments)) { + /* clang-format off */ + if (cont->lastScreen() == screen +- && (cont->activity().isEmpty() || cont->activity() == activity) ++ && ((cont->activity().isEmpty() || activity.isEmpty()) || cont->activity() == activity) + && (cont->containmentType() == Plasma::Types::DesktopContainment + || cont->containmentType() == Plasma::Types::CustomContainment)) { /* clang-format on */ + containment = cont; +-- +GitLab + |