更改字体列表的读取方式以避免崩溃 (#554)

Richasy · Nov 2, 2021 · c606355 · c606355
1 parent b8a46ac
commit c606355
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/src/Utilities/Toolkit/Toolkit.Uwp/FontToolkit.cs b/src/Utilities/Toolkit/Toolkit.Uwp/FontToolkit.cs
@@ -15,26 +15,13 @@ public class FontToolkit : IFontToolkit
         /// <inheritdoc/>
         public List<string> GetSystemFontList()
         {
-            var defaultLan = "en-us";
             try
             {
-                var fonts = CanvasFontSet.GetSystemFontSet();
-                var result = new List<string>();
-                foreach (var font in fonts.Fonts)
+                var localeList = new List<string>
                 {
-                    font.FamilyNames.TryGetValue(defaultLan, out var fontName);
-                    if (string.IsNullOrEmpty(fontName) && font.FamilyNames.Count > 0)
-                    {
-                        fontName = font.FamilyNames.First().Value;
-                    }
-
-                    if (!string.IsNullOrEmpty(fontName) && !result.Contains(fontName))
-                    {
-                        result.Add(fontName);
-                    }
-                }
-
-                return result;
+                    "zh-cn",
+                };
+                return CanvasTextFormat.GetSystemFontFamilies(localeList).OrderBy(x => x).ToList();
             }
             catch (System.Exception)
             {