plasma-integration: Upstream patch for Qt 5.8 font style names
Since Qt 5.8, font style names are handled in a way that prevents alternate styles (bold, italic, etc.) from being selected for user interface fonts. See also: https://phabricator.kde.org/D9070
This commit is contained in:
parent
65170e9404
commit
d78f9f030b
@ -125,7 +125,7 @@ let
|
||||
milou = callPackage ./milou.nix {};
|
||||
oxygen = callPackage ./oxygen.nix {};
|
||||
plasma-desktop = callPackage ./plasma-desktop {};
|
||||
plasma-integration = callPackage ./plasma-integration.nix {};
|
||||
plasma-integration = callPackage ./plasma-integration {};
|
||||
plasma-nm = callPackage ./plasma-nm {};
|
||||
plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
|
||||
plasma-vault = callPackage ./plasma-vault {};
|
||||
|
24
pkgs/desktops/plasma-5/plasma-integration/D9070.patch
Normal file
24
pkgs/desktops/plasma-5/plasma-integration/D9070.patch
Normal file
@ -0,0 +1,24 @@
|
||||
Index: src/platformtheme/kfontsettingsdata.cpp
|
||||
===================================================================
|
||||
--- src/platformtheme/kfontsettingsdata.cpp
|
||||
+++ src/platformtheme/kfontsettingsdata.cpp
|
||||
@@ -70,15 +70,18 @@
|
||||
const KFontData &fontData = DefaultFontData[fontType];
|
||||
cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight);
|
||||
cachedFont->setStyleHint(fontData.StyleHint);
|
||||
- cachedFont->setStyleName(QLatin1String(fontData.StyleName));
|
||||
|
||||
const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey);
|
||||
QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString());
|
||||
|
||||
//If we have serialized information for this font, restore it
|
||||
//NOTE: We are not using KConfig directly because we can't call QFont::QFont from here
|
||||
if (!fontInfo.isEmpty()) {
|
||||
cachedFont->fromString(fontInfo);
|
||||
+ } else {
|
||||
+ // set the canonical stylename here, where it cannot override
|
||||
+ // user-specific font attributes if those do not include a stylename.
|
||||
+ cachedFont->setStyleName(QLatin1String(fontData.StyleName));
|
||||
}
|
||||
|
||||
mFonts[fontType] = cachedFont;
|
@ -14,4 +14,11 @@ mkDerivation {
|
||||
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
|
||||
libXcursor qtquickcontrols2
|
||||
];
|
||||
patches = [
|
||||
# See also: https://phabricator.kde.org/D9070
|
||||
# ttuegel: The patch is checked into Nixpkgs because I could not get
|
||||
# Phabricator to give me a stable link to it.
|
||||
./D9070.patch
|
||||
];
|
||||
patchFlags = "-p0";
|
||||
}
|
Loading…
Reference in New Issue
Block a user