From 0faedfd4a0c042da4a5a0cd86af8dd3ebe1aa719 Mon Sep 17 00:00:00 2001
From: kateleet <huanganjun@cutefishos.com>
Date: Sun, 28 Nov 2021 03:01:04 +0800
Subject: [PATCH] fontconfig: Add family fallback

---
 settings-daemon/theme/thememanager.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/settings-daemon/theme/thememanager.cpp b/settings-daemon/theme/thememanager.cpp
index ee1fa07..d412819 100644
--- a/settings-daemon/theme/thememanager.cpp
+++ b/settings-daemon/theme/thememanager.cpp
@@ -367,9 +367,11 @@ void ThemeManager::updateGtkIconTheme()
 
 void ThemeManager::updateFontConfig()
 {
-    const QString &fimilyFont = systemFont();
+    const QString &familyFont = systemFont();
     const QString &fixedFont = systemFixedFont();
 
+    const QString &familyFallback = "Noto Sans";
+
     QSettings settings(QSettings::UserScope, "cutefishos", "theme");
     bool hinting = settings.value("XftAntialias", 1).toBool();
     QString hintStyle = settings.value("XftHintStyle", "hintslight").toString();
@@ -406,7 +408,7 @@ void ThemeManager::updateFontConfig()
                         "</edit>"
                         "</match>"
                         "<match target=\"font\">"
-                        "<edit name=\"rgba\"><const>rgb</const></edit>"
+                        "<edit name=\"rgba\" mode=\"assign\"><const>rgb</const></edit>"
                         "</match>"
                         "<match target=\"font\">"
                         "<edit name=\"hinting\" mode=\"assign\">"
@@ -419,10 +421,10 @@ void ThemeManager::updateFontConfig()
                         "</edit>"
                         "</match>"
                         "</fontconfig>"
-    ).arg(fimilyFont).arg(fimilyFont)
-     .arg(fimilyFont).arg(fimilyFont)
+    ).arg(familyFont).arg(familyFallback)
+     .arg(familyFont).arg(familyFallback)
      .arg(fixedFont).arg(fixedFont)
-     .arg(fimilyFont).arg(hinting ? "true" : "false")
+     .arg(familyFont).arg(hinting ? "true" : "false")
      .arg(hintStyle);
 
     QString targetPath(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + QLatin1String("fontconfig"));