diff --git a/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs b/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs index ba59adbb..5a3fca95 100644 --- a/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs +++ b/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs @@ -1,3 +1,5 @@ +using System; +using System.Collections.Generic; using System.IO; using Avalonia; using Avalonia.Media; @@ -8,22 +10,22 @@ public static class AppBuilderExtension { public static AppBuilder WithFontByDefault(this AppBuilder appBuilder) { + var fallbacks = new List(); + var notoSansSc = new FontFamily(Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC")); + fallbacks.Add(new FontFallback { FontFamily = notoSansSc }); - var fallbacks = new[] + if (OperatingSystem.IsLinux()) { - new FontFallback { FontFamily = notoSansSc }, - - OperatingSystem.IsLinux() - ? new FontFallback { FontFamily = new FontFamily("Noto Color Emoji") } - : null - }; - - var validFallbacks = fallbacks.Where(f => f is not null).ToArray()!; + fallbacks.Add(new FontFallback + { + FontFamily = new FontFamily("Noto Color Emoji") + }); + } return appBuilder.With(new FontManagerOptions { - FontFallbacks = validFallbacks + FontFallbacks = fallbacks.ToArray() }); } }