From 755ae37a3c8e6bc4af233a3963689ff79eaab9e6 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Mon, 4 Oct 2021 18:46:14 +0800
Subject: [PATCH] Fix fonts

---
 src/fontsmodel.cpp          | 4 +++-
 src/qml/Appearance/Main.qml | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/fontsmodel.cpp b/src/fontsmodel.cpp
index 3cb3514..169764a 100644
--- a/src/fontsmodel.cpp
+++ b/src/fontsmodel.cpp
@@ -125,7 +125,9 @@ void FontsModel::run()
          if (fixedPitch && !m_fixedFonts.contains(family)) {
              m_fixedFonts.append(family);
          } else {
-             if (!m_generalFonts.contains(family) && language.contains(m_lanCode, Qt::CaseInsensitive))
+             if (!m_generalFonts.contains(family)
+                     && (language.contains(m_lanCode, Qt::CaseInsensitive) ||
+                         language.contains(m_lanCode.split('-').first(), Qt::CaseInsensitive)))
                  m_generalFonts.append(family);
          }
     }
diff --git a/src/qml/Appearance/Main.qml b/src/qml/Appearance/Main.qml
index 34b249d..36a6ac5 100644
--- a/src/qml/Appearance/Main.qml
+++ b/src/qml/Appearance/Main.qml
@@ -161,6 +161,7 @@ ItemPage {
                         model.append({"accentColor": String(FishUI.Theme.purpleColor)})
                         model.append({"accentColor": String(FishUI.Theme.pinkColor)})
                         model.append({"accentColor": String(FishUI.Theme.orangeColor)})
+                        model.append({"accentColor": String(FishUI.Theme.greyColor)})
                     }
 
                     delegate: Item {