Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-11-29 03:02:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update AppBuilderExtension.cs

Browse source
This commit is contained in:
JieXu 2025-11-17 21:01:11 +08:00 committed by GitHub
parent d433d4a174
commit 995097801d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs
View file

@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using Avalonia;
using Avalonia.Media;
using System.Collections.Generic;
namespace v2rayN.Desktop.Common;
@ -23,9 +23,11 @@ public static class AppBuilderExtension
});
}
var fallbacks = new List<FontFallback>();
List<FontFallback> fallbacks = new();
string? zhFamily = RunFcMatchFamily("sans:lang=zh-cn");
string? emojiFamily = RunFcMatchFamily("emoji");
var zhFamily = RunFcFamily("sans:lang=zh-cn");
if (!string.IsNullOrWhiteSpace(zhFamily))
{
fallbacks.Add(new FontFallback
@ -34,7 +36,6 @@ public static class AppBuilderExtension
});
}
var emojiFamily = RunFcFamily("emoji");
if (!string.IsNullOrWhiteSpace(emojiFamily))
{
fallbacks.Add(new FontFallback
@ -43,10 +44,10 @@ public static class AppBuilderExtension
});
}
var notoUri = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC");
var localFont = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC");
fallbacks.Add(new FontFallback
{
FontFamily = new FontFamily(notoUri)
FontFamily = new FontFamily(localFont)
});
return appBuilder.With(new FontManagerOptions
@ -55,7 +56,7 @@ public static class AppBuilderExtension
});
}
private static string? RunFcFamily(string pattern)
private static string? RunFcMatchFamily(string pattern)
{
try
{
@ -64,15 +65,13 @@ public static class AppBuilderExtension
FileName = "/bin/bash",
ArgumentList = { "-c", $"fc-match -f \"%{{family}}\\n\" \"{pattern}\" | head -n 1" },
RedirectStandardOutput = true,
RedirectStandardError = true,
UseShellExecute = false
};
using var p = Process.Start(psi);
if (p == null)
return null;
if (p == null) return null;
var output = p.StandardOutput.ReadToEnd().Trim();
string output = p.StandardOutput.ReadToEnd().Trim();
return string.IsNullOrWhiteSpace(output) ? null : output;
}
catch