Merge pull request #377 from zdpcdt/font

Web demo font
irihitech · Jul 11, 2024 · 915c45c · 915c45c
2 parents f66edd5 + db137ef
commit 915c45c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/demo/Semi.Avalonia.Demo.Web/AvaloniaAppBuilderExtensions.cs b/demo/Semi.Avalonia.Demo.Web/AvaloniaAppBuilderExtensions.cs
@@ -0,0 +1,16 @@
+using Avalonia;
+using Avalonia.Media;
+
+namespace Semi.Avalonia.Demo.Web;
+
+public static class AvaloniaAppBuilderExtensions
+{
+    private static string DefaultFontFamily => "avares://Semi.Avalonia.Demo.Web/Assets#Source Han Sans CN";
+
+    public static AppBuilder WithSourceHanSansCNFont(this AppBuilder builder) =>
+        builder.With(new FontManagerOptions
+        {
+            DefaultFamilyName = DefaultFontFamily,
+            FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(DefaultFontFamily) } }
+        });
+}
diff --git a/demo/Semi.Avalonia.Demo.Web/Program.cs b/demo/Semi.Avalonia.Demo.Web/Program.cs
@@ -10,6 +10,7 @@ namespace Semi.Avalonia.Demo.Web;
 internal sealed partial class Program
 {
     private static Task Main(string[] args) => BuildAvaloniaApp()
+        .WithSourceHanSansCNFont()
         .StartBrowserAppAsync("out");
 
     public static AppBuilder BuildAvaloniaApp()

diff --git a/demo/Semi.Avalonia.Demo.Web/linker.xml → demo/Semi.Avalonia.Demo.Web/Roots.xml b/demo/Semi.Avalonia.Demo.Web/linker.xml → demo/Semi.Avalonia.Demo.Web/Roots.xml
diff --git a/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj b/demo/Semi.Avalonia.Demo.Web/Semi.Avalonia.Demo.Web.csproj
@@ -5,14 +5,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+        <AvaloniaResource Include="Assets\**"/>
+        <TrimmerRootDescriptor Include="Roots.xml"/>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj" />
+        <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
     </ItemGroup>
 
     <ItemGroup>
-        <TrimmerRootDescriptor Include="linker.xml" />
+        <ProjectReference Include="..\Semi.Avalonia.Demo\Semi.Avalonia.Demo.csproj"/>
     </ItemGroup>
 </Project>