Port microsoft/microsoft-ui-xaml#4862 (#652)

Kinnara · Dec 14, 2023 · a3eb7ad · a3eb7ad
1 parent b2bd326
commit a3eb7ad
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/ModernWpf/Styles/TextStyles.xaml b/ModernWpf/Styles/TextStyles.xaml
@@ -13,47 +13,43 @@
 
     <Style x:Key="BaseTextBlockStyle" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MessageFontFamilyKey}}" />
+        <Setter Property="FontSize" Value="{StaticResource BodyTextBlockFontSize}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
         <Setter Property="TextTrimming" Value="CharacterEllipsis" />
         <Setter Property="TextWrapping" Value="Wrap" />
         <Setter Property="LineStackingStrategy" Value="MaxHeight" />
         <!--<Setter Property="TextLineBounds" Value="Full" />-->
-        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
 
     <Style x:Key="CaptionTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="{StaticResource CaptionTextBlockFontSize}" />
         <Setter Property="FontWeight" Value="Normal" />
-        <!--<Setter Property="OpticalMarginAlignment" Value="None" />-->
     </Style>
 
     <Style x:Key="BodyTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
-        <Setter Property="FontSize" Value="{StaticResource BodyTextBlockFontSize}" />
         <Setter Property="FontWeight" Value="Normal" />
-        <!--<Setter Property="OpticalMarginAlignment" Value="None" />-->
     </Style>
 
-    <Style x:Key="BodyStrongTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BodyTextBlockStyle}">
-        <Setter Property="FontWeight" Value="SemiBold" />
-    </Style>
+    <Style x:Key="BodyStrongTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BodyTextBlockStyle}" />
 
     <Style x:Key="SubtitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="{StaticResource SubtitleTextBlockFontSize}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
 
     <Style x:Key="TitleTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="{StaticResource TitleTextBlockFontSize}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
 
     <Style x:Key="TitleLargeTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="{StaticResource TitleLargeTextBlockFontSize}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
 
     <Style x:Key="DisplayTextBlockStyle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
         <Setter Property="FontSize" Value="{StaticResource DisplayTextBlockFontSize}" />
-        <Setter Property="FontWeight" Value="SemiBold" />
+        <!--<Setter Property="OpticalMarginAlignment" Value="TrimSideBearings" />-->
     </Style>
 
     <!-- Legacy styles -->