Skip to content

Commit 270b79a

Browse files
authored
Sets the FontWeight of ToolTip as Normal (#10546)
* Sets the fontweight of tooltip as normal * Addressing PR comments
1 parent 82de5b5 commit 270b79a

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Styles/ToolTip.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<Setter Property="TextBlock.TextAlignment" Value="Justify" />
2222
<Setter Property="TextElement.Foreground" Value="{DynamicResource ToolTipForeground}" />
2323
<Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
24+
<Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}"/>
25+
<Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.StatusFontSizeKey}}"/>
26+
<Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}"/>
2427
<Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
2528
<Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
2629
<Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}"/>

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Dark.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4802,6 +4802,9 @@
48024802
<Setter Property="TextBlock.TextAlignment" Value="Justify" />
48034803
<Setter Property="TextElement.Foreground" Value="{DynamicResource ToolTipForeground}" />
48044804
<Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
4805+
<Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
4806+
<Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.StatusFontSizeKey}}" />
4807+
<Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
48054808
<Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
48064809
<Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
48074810
<Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.HC.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4783,6 +4783,9 @@
47834783
<Setter Property="TextBlock.TextAlignment" Value="Justify" />
47844784
<Setter Property="TextElement.Foreground" Value="{DynamicResource ToolTipForeground}" />
47854785
<Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
4786+
<Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
4787+
<Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.StatusFontSizeKey}}" />
4788+
<Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
47864789
<Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
47874790
<Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
47884791
<Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />

src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Themes/Fluent.Light.xaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,6 +4799,9 @@
47994799
<Setter Property="TextBlock.TextAlignment" Value="Justify" />
48004800
<Setter Property="TextElement.Foreground" Value="{DynamicResource ToolTipForeground}" />
48014801
<Setter Property="Foreground" Value="{DynamicResource ToolTipForeground}" />
4802+
<Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.StatusFontFamilyKey}}" />
4803+
<Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.StatusFontSizeKey}}" />
4804+
<Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.StatusFontStyleKey}}" />
48024805
<Setter Property="Background" Value="{DynamicResource ToolTipBackground}" />
48034806
<Setter Property="BorderBrush" Value="{DynamicResource ToolTipBorderBrush}" />
48044807
<Setter Property="BorderThickness" Value="{DynamicResource ToolTipBorderThemeThickness}" />

0 commit comments

Comments
 (0)