File fix-writing-Qt4-font-settings.patch of Package plasma5-desktop

Overview Repositories Revisions Requests Users Attributes Meta

File fix-writing-Qt4-font-settings.patch of Package plasma5-desktop (Revision 422f3ec08759602fbb3021f2eb0ff02c)

Currently displaying revision 422f3ec08759602fbb3021f2eb0ff02c , Show latest

From 978700d9b65b6118e93a87bc7fbe9c113ca7d2ab Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Fri, 30 Jun 2017 14:16:47 +0200
Subject: [KRDB] Read kdeglobals font and fallback to hardcoded default if
 neccessary

kcminit is non-desktopSettingsAware (for performance) which will keep it from loading
our platform theme. This also means that QFontDatabase also won't know our font settings.

Based on a patch by jingyu9575, thanks.

BUG: 378262
---
 kcms/krdb/krdb.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
index 0d9f7a8..344287f 100644
--- a/kcms/krdb/krdb.cpp
+++ b/kcms/krdb/krdb.cpp
@@ -177,8 +177,19 @@ static void applyQtColors( KSharedConfigPtr kglobalcfg, QSettings& settings, QPa
 
 static void applyQtSettings( KSharedConfigPtr kglobalcfg, QSettings& settings )
 {
-  /* export font settings */
-  settings.setValue(QStringLiteral("/qt/font"), QFontDatabase::systemFont(QFontDatabase::GeneralFont).toString());
+    /* export font settings */
+
+    // NOTE keep this in sync with kfontsettingsdata in plasma-integration (cf. also Bug 378262)
+    QFont defaultFont(QStringLiteral("Noto Sans"), 10, -1);
+    defaultFont.setStyleHint(QFont::SansSerif);
+
+    const KConfigGroup configGroup(KSharedConfig::openConfig(), QStringLiteral("General"));
+    const QString fontInfo = configGroup.readEntry(QStringLiteral("font"), QString());
+    if (!fontInfo.isEmpty()) {
+        defaultFont.fromString(fontInfo);
+    }
+
+    settings.setValue(QStringLiteral("/qt/font"), defaultFont.toString());
 
   /* export effects settings */
   KConfigGroup kdeCfgGroup(kglobalcfg, "General");
-- 
cgit v0.11.2

Places

File fix-writing-Qt4-font-settings.patch of Package plasma5-desktop (Revision 422f3ec08759602fbb3021f2eb0ff02c)

Places