NewLife/XCoder

feat: 按界面语言切换 CJK 字体

- UI 与等宽字体链按语言选择简繁、日文、韩文 CJK 字体
- 语言切换即时更新 FontUI/FontMono 动态资源,修复繁体及切回简体后的异常字形
- 补充字体链与动态资源测试
大石头 authored at 2026-11-12 11:04:23
185ed52
Tree
1 Parent(s) 6bf9129
Summary: 6 changed files with 95 additions and 0 deletions.
Modified +13 -0
Modified +36 -0
Modified +24 -0
Modified +11 -0
Modified +8 -0
Modified +3 -0
Modified +13 -0
diff --git a/Tests/XCoder.App.Tests/FontOptionsTests.cs b/Tests/XCoder.App.Tests/FontOptionsTests.cs
index d7370ff..258d8d4 100644
--- a/Tests/XCoder.App.Tests/FontOptionsTests.cs
+++ b/Tests/XCoder.App.Tests/FontOptionsTests.cs
@@ -24,6 +24,19 @@ public class FontOptionsTests
     }
 
     [Fact]
+    [DisplayName("界面与等宽字体按语言选择 CJK 回退")]
+    public void LanguageFonts_UseMatchingCjkFamilies()
+    {
+        Assert.Contains("Microsoft YaHei UI", new FontFamily(FontOptions.GetUiFontFamily("zh-CN")).FamilyNames);
+        Assert.Contains("Microsoft JhengHei UI", new FontFamily(FontOptions.GetUiFontFamily("zh-TW")).FamilyNames);
+        Assert.Contains("Yu Gothic UI", new FontFamily(FontOptions.GetUiFontFamily("ja-JP")).FamilyNames);
+        Assert.Contains("Malgun Gothic", new FontFamily(FontOptions.GetUiFontFamily("ko-KR")).FamilyNames);
+
+        Assert.Contains("Noto Sans Mono CJK TC", new FontFamily(FontOptions.GetMonoFallback("zh-TW")).FamilyNames);
+        Assert.Contains("Malgun Gothic", new FontFamily(FontOptions.GetMonoFallback("ko-KR")).FamilyNames);
+    }
+
+    [Fact]
     [DisplayName("字体管理器把缺失的 Consolas 映射到等宽回退链")]
     public void Create_MapsConsolasToMonoFallback()
     {
Modified +36 -0
diff --git a/Tests/XCoder.App.UiTests/LocalizationUiTests.cs b/Tests/XCoder.App.UiTests/LocalizationUiTests.cs
index e87ab6f..aeaad61 100644
--- a/Tests/XCoder.App.UiTests/LocalizationUiTests.cs
+++ b/Tests/XCoder.App.UiTests/LocalizationUiTests.cs
@@ -71,6 +71,42 @@ public class LocalizationUiTests
     }
 
     [Fact]
+    [DisplayName("切换繁体后界面字体切到繁体 CJK 回退链")]
+    public async Task UiFont_SwitchesWithLanguage()
+    {
+        var old = LocalizationService.Preference;
+        try
+        {
+            await UiSession.Run(() =>
+            {
+                LocalizationService.Apply("zh-TW", false);
+
+                var font = Avalonia.Application.Current!.Resources["FontUI"] as Avalonia.Media.FontFamily;
+                Assert.NotNull(font);
+                Assert.Contains("Microsoft JhengHei UI", font!.FamilyNames);
+
+                var view = new SettingsToolView();
+                var window = new Window { Content = view };
+                window.Show();
+                var titleFont = view.FindControl<TextBlock>("TitleText")?.FontFamily;
+                var quickFont = view.FindControl<TextBox>("QuickBox")?.FontFamily;
+                Assert.Contains("Microsoft JhengHei UI", titleFont!.FamilyNames);
+                Assert.Contains("Cascadia Code", quickFont!.FamilyNames);
+                window.Close();
+
+                LocalizationService.Apply("zh-CN", false);
+                font = Avalonia.Application.Current!.Resources["FontUI"] as Avalonia.Media.FontFamily;
+                Assert.NotNull(font);
+                Assert.Contains("Microsoft YaHei UI", font!.FamilyNames);
+            });
+        }
+        finally
+        {
+            LocalizationService.Apply(old, false);
+        }
+    }
+
+    [Fact]
     [DisplayName("语言下拉按当前界面语言显示名称")]
     public async Task LanguageOptions_UseCurrentLanguageNames()
     {
Modified +24 -0
diff --git a/XCoder.App/Common/FontOptions.cs b/XCoder.App/Common/FontOptions.cs
index ae49efd..5b706c5 100644
--- a/XCoder.App/Common/FontOptions.cs
+++ b/XCoder.App/Common/FontOptions.cs
@@ -23,4 +23,28 @@ public static class FontOptions
             ["Consolas"] = new(MonoFallback),
         },
     };
+
+    /// <summary>按界面语言选择 UI 字体回退链</summary>
+    /// <param name="language">语言代码,如 zh-CN / zh-TW / ja-JP</param>
+    /// <returns>以 Inter 为拉丁字体、按语言选择 CJK 字体的回退链</returns>
+    public static String GetUiFontFamily(String language) => language switch
+    {
+        "zh-TW" => "Inter, Microsoft JhengHei UI, Microsoft JhengHei, PingFang TC, Noto Sans CJK TC, Noto Sans TC",
+        "zh-CN" => "Inter, Microsoft YaHei UI, Microsoft YaHei, PingFang SC, Noto Sans CJK SC, Noto Sans SC",
+        "ja-JP" => "Inter, Yu Gothic UI, Yu Gothic, Hiragino Sans, Noto Sans CJK JP, Noto Sans JP",
+        "ko-KR" => "Inter, Malgun Gothic, Apple SD Gothic Neo, Noto Sans CJK KR, Noto Sans KR",
+        "ar-SA" => "Inter, Segoe UI, Tahoma, Noto Sans Arabic",
+        _ => "Inter, Segoe UI",
+    };
+
+    /// <summary>按界面语言选择等宽字体回退链</summary>
+    /// <param name="language">语言代码,如 zh-CN / zh-TW / ja-JP</param>
+    /// <returns>等宽字体链;CJK 回退字体与界面语言一致</returns>
+    public static String GetMonoFallback(String language) => language switch
+    {
+        "zh-TW" => "Cascadia Code, JetBrains Mono, Consolas, SF Mono, Menlo, DejaVu Sans Mono, Noto Sans Mono, Noto Sans Mono CJK TC, Microsoft JhengHei UI, PingFang TC",
+        "ja-JP" => "Cascadia Code, JetBrains Mono, Consolas, SF Mono, Menlo, DejaVu Sans Mono, Noto Sans Mono, Noto Sans Mono CJK JP, Yu Gothic UI, Hiragino Sans",
+        "ko-KR" => "Cascadia Code, JetBrains Mono, Consolas, SF Mono, Menlo, DejaVu Sans Mono, Noto Sans Mono, Noto Sans Mono CJK KR, Malgun Gothic, Apple SD Gothic Neo",
+        _ => MonoFallback,
+    };
 }
Modified +11 -0
diff --git a/XCoder.App/Services/LocalizationService.cs b/XCoder.App/Services/LocalizationService.cs
index 0c8df1f..79030d7 100644
--- a/XCoder.App/Services/LocalizationService.cs
+++ b/XCoder.App/Services/LocalizationService.cs
@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Avalonia.Media;
 using Avalonia.Threading;
 using NewLife;
 using NewLife.Log;
@@ -151,6 +152,7 @@ public static class LocalizationService
         }
 
         _preference = preference;
+        ApplyFontResources();
 
         if (save)
         {
@@ -316,6 +318,15 @@ public static class LocalizationService
         return text;
     }
 
+    private static void ApplyFontResources()
+    {
+        var app = Avalonia.Application.Current;
+        if (app == null) return;
+
+        app.Resources["FontUI"] = new FontFamily(FontOptions.GetUiFontFamily(Language));
+        app.Resources["FontMono"] = new FontFamily(FontOptions.GetMonoFallback(Language));
+    }
+
     private static void RestoreSystemCulture()
     {
         var code = SystemLanguage;
Modified +8 -0
diff --git a/XCoder.App/Themes/Controls.axaml b/XCoder.App/Themes/Controls.axaml
index a8d698c..165a4db 100644
--- a/XCoder.App/Themes/Controls.axaml
+++ b/XCoder.App/Themes/Controls.axaml
@@ -2,6 +2,14 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <!-- 工作台外壳的控件样式;工具窗口内部的既有样式不受影响 -->
 
+    <!-- 界面字体:按语言动态切换 CJK 回退字体,避免繁体/日文/韩文落到简体字形 -->
+    <Style Selector="TemplatedControl">
+        <Setter Property="FontFamily" Value="{DynamicResource FontUI}" />
+    </Style>
+    <Style Selector="TextBlock">
+        <Setter Property="FontFamily" Value="{DynamicResource FontUI}" />
+    </Style>
+
     <!-- 基础控件皮肤:让工具页的按钮、输入框、下拉框与外壳保持同一套圆角与焦点态 -->
     <Style Selector="Button">
         <Setter Property="MinHeight" Value="32" />
Modified +3 -0
diff --git a/XCoder.App/Themes/Tokens.axaml b/XCoder.App/Themes/Tokens.axaml
index 840625f..c677669 100644
--- a/XCoder.App/Themes/Tokens.axaml
+++ b/XCoder.App/Themes/Tokens.axaml
@@ -71,6 +71,9 @@
     <SolidColorBrush x:Key="ConsoleSelection" Color="#1E4C7A" />
     <SolidColorBrush x:Key="ConsoleMuted" Color="#7C8FA6" />
 
+    <!-- 界面字体回退链:拉丁用 Inter,CJK 按界面语言在运行时切换简繁/日/韩字体 -->
+    <FontFamily x:Key="FontUI">Inter, Microsoft YaHei UI, Microsoft YaHei, PingFang SC, Noto Sans CJK SC, Noto Sans SC</FontFamily>
+
     <!-- 等宽字体回退链:优先设计稿字体,缺失时逐级回退到跨平台等宽字体与中文回退 -->
     <FontFamily x:Key="FontMono">Cascadia Code, JetBrains Mono, Consolas, SF Mono, Menlo, DejaVu Sans Mono, Noto Sans Mono, Noto Sans Mono CJK SC, Microsoft YaHei UI, PingFang SC</FontFamily>