优化 全部TextStyle 都使用 FontFamily.Field 字体, Microsoft Sans Serif 会导致…

优化 全部TextStyle 都使用 FontFamily.Field 字体, Microsoft Sans Serif 会导致 中文出现“奇怪中文"。Microsoft Yahei 没这个问题。Microsoft Yahei要钱不能商用

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/BaseStyle.xaml

@@ -2,9 +2,13 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors.xaml"/>
+        <ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Colors2.xaml"/>
     </ResourceDictionary.MergedDictionaries>
 
     <!-- 标准间隔 -->
     <Thickness x:Key="ControlMargin">5</Thickness>
     
+    <!--Microsoft Sans Serif-->
+    <FontFamily x:Key="FontFamily.Field">Microsoft Sans Serif</FontFamily>
+    
 </ResourceDictionary>
\ No newline at end of file

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/TextStyle2.xaml

@@ -47,7 +47,7 @@
         <Setter Property="Foreground"  Value="#FF3B3B3B" />
         <Setter Property="FontWeight"  Value="Bold" />
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldHeader}" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
         <Setter Property="TextAlignment"  Value="Left" />
     </Style>
 
@@ -76,7 +76,7 @@
         <Setter Property="Foreground"  Value="#FF3B3B3B" />
         <!--<Setter Property="FontWeight"  Value="Bold" />-->
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
         <Setter Property="TextAlignment"  Value="Left" />
     </Style>
 
@@ -86,7 +86,7 @@
         <Setter Property="Foreground"  Value="#FF3B3B3B" />
         <!--<Setter Property="FontWeight"  Value="Bold" />-->
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent}" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
         <Setter Property="TextAlignment"  Value="Left" />
         <Setter Property="MinWidth"  Value="30" />
     </Style>
@@ -108,7 +108,7 @@
     <Style TargetType="TextBlock" x:Key="Styles.Text.FieldContent.Unit">
         <Setter Property="Foreground"  Value="#FF888888" />
         <Setter Property="FontSize"  Value="{StaticResource FontSize.FieldContent.Small}" />
-        <Setter Property="FontFamily"  Value="Microsoft Sans Serif" />
+        <Setter Property="FontFamily"  Value="{StaticResource FontFamily.Field}" />
         <Setter Property="TextAlignment"  Value="Left" />
         <Setter Property="VerticalAlignment"  Value="Bottom" />
     </Style>