Merge commit '137568a7c94b93f991ead438940a1b2c530fa12b' into dev

lindexi · Oct 7, 2023 · 0a52cb2 · 0a52cb2
2 parents 13c92e0 + 137568a
commit 0a52cb2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CalkejeljereChalreloyajur/CalkejeljereChalreloyajur/MainWindow.xaml.cs b/CalkejeljereChalreloyajur/CalkejeljereChalreloyajur/MainWindow.xaml.cs
@@ -23,7 +23,7 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
-        var file = "f:\\temp\\汉仪文黑-85W.ttf";
+        var file = "f:\\temp\\hw.ttf";
 
         PrivateFontCollection collection = new PrivateFontCollection();
         collection.AddFontFile(file);
@@ -33,8 +33,8 @@ public MainWindow()
         }
 
         var uri = new Uri(file);
-        FontFamily fontFamily = new FontFamily(uri, "汉仪文黑-85W");
-        //TextBlock.FontFamily = fontFamily;
+        FontFamily fontFamily = new FontFamily(uri, "hw");
+        TextBlock.FontFamily = fontFamily;
         TextBlock.FontWeight = FontWeight.FromOpenTypeWeight(485);
         Loaded += MainWindow_Loaded;
     }