Commit e11c43c9 authored by Bart Ribbers's avatar Bart Ribbers
Browse files

community/plasma-workspace: backport upstream requested patch

Fixes https://bugs.kde.org/show_bug.cgi?id=453348
parent 9242ed5b
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
......@@ -2,7 +2,7 @@
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-workspace
pkgver=5.24.5
pkgrel=0
pkgrel=1
pkgdesc="KDE Plasma Workspace"
# armhf blocked by kirigami2
# s390x and riscv64 blocked by polkit -> kio-extras
......@@ -80,7 +80,9 @@ case "$pkgver" in
*.90*) _rel=unstable;;
*) _rel=stable;;
esac
source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz"
source="https://download.kde.org/$_rel/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
"
subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang $pkgname-dbg"
replaces="plasma-desktop<5.24 breeze<5.22.90"
......@@ -129,4 +131,5 @@ package() {
sha512sums="
ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 plasma-workspace-5.24.5.tar.xz
022f1407c538f396cdd1fd9c228a56450ed868e0f16e42333cd10fca238fb5e12b38596f65b06159b573628c290f86d8af8dca136b1acafe4042d4c0d91e8a63 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
"
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment