Fix fonts

4 years ago · 755ae37a3c
parent 7bfd79a2ea
commit 755ae37a3c
2 changed files with 4 additions and 1 deletions
--- 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);
         }
    }
--- 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 {