diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2022-06-09 23:04:16 -0500 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2022-10-21 18:34:01 -0500 |
| commit | 3f86cdce3fdc695f68d9509bcee57892292c3b5d (patch) | |
| tree | dc5e5a7e4e60092d82583b799bf05c28ca5ba6ae /user/plasma-workspace/backport1.patch | |
| parent | 1a8ec08761b79fd68225f69070c875e162a826bc (diff) | |
| download | packages-3f86cdce3fdc695f68d9509bcee57892292c3b5d.tar.gz packages-3f86cdce3fdc695f68d9509bcee57892292c3b5d.tar.bz2 packages-3f86cdce3fdc695f68d9509bcee57892292c3b5d.tar.xz packages-3f86cdce3fdc695f68d9509bcee57892292c3b5d.zip | |
user/[KDE packages]: Backport requests from upstream
Diffstat (limited to 'user/plasma-workspace/backport1.patch')
| -rw-r--r-- | user/plasma-workspace/backport1.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/user/plasma-workspace/backport1.patch b/user/plasma-workspace/backport1.patch new file mode 100644 index 000000000..c2ccc0f62 --- /dev/null +++ b/user/plasma-workspace/backport1.patch @@ -0,0 +1,40 @@ +From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001 +From: Nate Graham <nate@kde.org> +Date: Wed, 4 May 2022 10:45:52 -0600 +Subject: [PATCH] applets/appmenu: fix top-level menu text coloration + +28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but +neglected to respect the Plasma color scheme, if any. This causes +problems with Plasma themes that have their own colors and don't +respect the systemwide color scheme, such as Breeze Twilight. + +Fix it by using the appropriate colors from the PlasmaCore color scheme +object, not the systemwide object provided by Qt. + +BUG: 453348 +FIXED-IN: 5.24.6 + + +(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e) +--- + applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml +index 441e99016..afb37589a 100644 +--- a/applets/appmenu/package/contents/ui/MenuDelegate.qml ++++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml +@@ -66,9 +66,6 @@ AbstractButton { + + contentItem: PC3.Label { + text: controlRoot.Kirigami.MnemonicData.richTextLabel +- // Kirigami.Theme.highlightedTextColor returns different colors +- // depending on window focus, which does not apply to this applet +- // instead, we use palette.highlightedText here, which returns consistent result +- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText ++ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor + } + } +-- +GitLab + |