Accepting request 978148 from home:Vogtinator:plasma5.24
- Add patch to fix appmenu text with certain themes (kde#453348): * 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch - Add patch to also show themes with a newer metadata format (kde#453830): * 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch OBS-URL: https://build.opensuse.org/request/show/978148 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=641
This commit is contained in:
Luca Beltrame
committed by
Git OBS Bridge
Git OBS Bridge
parent
1a16b30942
commit
1964b3accd
@@ -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
|
||||
}
|
||||
}
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001
|
||||
From: Fushan Wen <qydwhotmail@gmail.com>
|
||||
Date: Mon, 16 May 2022 16:18:00 +0800
|
||||
Subject: [PATCH] kcms/desktoptheme: find metadata.json when loading
|
||||
ThemesModel
|
||||
|
||||
Before this commit ThemesModel only finds metadata.desktop, but after
|
||||
KF5.94, the default theme metadata files have been ported to json format.
|
||||
|
||||
BUG: 453830
|
||||
|
||||
|
||||
(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e)
|
||||
---
|
||||
kcms/desktoptheme/themesmodel.cpp | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp
|
||||
index 6f0ecf4e3..296951742 100644
|
||||
--- a/kcms/desktoptheme/themesmodel.cpp
|
||||
+++ b/kcms/desktoptheme/themesmodel.cpp
|
||||
@@ -155,7 +155,15 @@ void ThemesModel::load()
|
||||
const QDir cd(ppath);
|
||||
const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
|
||||
for (const QString &pack : entries) {
|
||||
- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop");
|
||||
+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator());
|
||||
+
|
||||
+ QString _metadata = QStringLiteral("%1json").arg(prefix);
|
||||
+ if (QFile::exists(_metadata)) {
|
||||
+ themes << _metadata;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
+ _metadata = QStringLiteral("%1desktop").arg(prefix);
|
||||
if (QFile::exists(_metadata)) {
|
||||
themes << _metadata;
|
||||
}
|
||||
--
|
||||
2.36.0
|
||||
|
||||
@@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed May 18 18:34:03 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Add patch to fix appmenu text with certain themes (kde#453348):
|
||||
* 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
|
||||
- Add patch to also show themes with a newer metadata format (kde#453830):
|
||||
* 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 3 13:00:25 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@@ -41,6 +41,9 @@ Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspa
|
||||
Source2: plasma.keyring
|
||||
%endif
|
||||
Source3: xprop-kde-full-session.desktop
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch
|
||||
Patch2: 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch
|
||||
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
|
||||
Patch501: 0001-Use-qdbus-qt5.patch
|
||||
Patch502: 0001-Ignore-default-sddm-face-icons.patch
|
||||
|
||||
Reference in New Issue
Block a user