From f57cc410587d686e882d60b6189a5f5662cdd27b Mon Sep 17 00:00:00 2001 From: JieXu Date: Tue, 18 Nov 2025 22:06:28 +0800 Subject: [PATCH] Update AppBuilderExtension.cs --- .../Common/AppBuilderExtension.cs | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs b/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs index ba59adbb..925be53b 100644 --- a/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs +++ b/v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs @@ -1,3 +1,4 @@ +using System.Collections.Generic; using System.IO; using Avalonia; using Avalonia.Media; @@ -8,22 +9,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() }); } }