[neon/kde/plasma-workspace/Neon/release] debian/patches: add patch recommended by nate

Jonathan Esk-Riddell null at kde.org
Fri May 20 17:04:07 BST 2022


Git commit b979bbd58c8b90486aed6f87dfbd894055c2cfbe by Jonathan Esk-Riddell.
Committed on 20/05/2022 at 16:03.
Pushed by jriddell into branch 'Neon/release'.

add patch recommended by nate

A  +35   -0    debian/patches/appmenu-text-colour.diff
M  +1    -0    debian/patches/series

https://invent.kde.org/neon/kde/plasma-workspace/commit/b979bbd58c8b90486aed6f87dfbd894055c2cfbe

diff --git a/debian/patches/appmenu-text-colour.diff b/debian/patches/appmenu-text-colour.diff
new file mode 100644
index 0000000..73fa1cf
--- /dev/null
+++ b/debian/patches/appmenu-text-colour.diff
@@ -0,0 +1,35 @@
+commit 4d3f99558cff95259590e70dfbf854a479f772ce
+Author: Nate Graham <nate at kde.org>
+Date:   Wed May 4 10:45:52 2022 -0600
+
+    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)
+
+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
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 03db5ec..b900b5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_incompatible_tests
+appmenu-text-colour.diff


More information about the Neon-commits mailing list