Skip to content

Commit 660a51e

Browse files
authored
Fix: Fixed an issue where context menus didn't follow the custom font setting (#16035)
1 parent a90fbac commit 660a51e

File tree

5 files changed

+20
-0
lines changed

5 files changed

+20
-0
lines changed

src/Files.App/App.xaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,22 @@
3131
<Setter Target="HighContrastAdjustment" Value="None" />
3232
</Style>
3333

34+
35+
<!-- Workaround for https://github.com/files-community/Files/issues/12026 -->
36+
<Style BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}" TargetType="MenuFlyoutItem">
37+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
38+
</Style>
39+
40+
<!-- Workaround for https://github.com/files-community/Files/issues/12026 -->
41+
<Style BasedOn="{StaticResource DefaultToggleMenuFlyoutItemStyle}" TargetType="ToggleMenuFlyoutItem">
42+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
43+
</Style>
44+
45+
<!-- Workaround for https://github.com/files-community/Files/issues/12026 -->
46+
<Style BasedOn="{StaticResource DefaultMenuFlyoutSubItemStyle}" TargetType="MenuFlyoutSubItem">
47+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
48+
</Style>
49+
3450
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="uc:ComboBoxEx" />
3551

3652
<ResourceDictionary.MergedDictionaries>

src/Files.App/Styles/MenuFlyoutSubItemWithImageStyle.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<Style x:Key="MenuFlyoutSubItemWithImageStyle" TargetType="MenuFlyoutSubItem">
88
<Setter Property="Padding" Value="{ThemeResource MenuFlyoutItemThemePadding}" />
99
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
10+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
1011
<Setter Property="Template">
1112
<Setter.Value>
1213
<ControlTemplate TargetType="MenuFlyoutSubItem">

src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<Style TargetType="local:MenuFlyoutItemWithImage">
1616
<Setter Property="Padding" Value="{ThemeResource MenuFlyoutItemThemePadding}" />
1717
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
18+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
1819
<Setter Property="Template">
1920
<Setter.Value>
2021
<ControlTemplate TargetType="local:MenuFlyoutItemWithImage">

src/Files.App/UserControls/Menus/MenuFlyoutItemWithThemedIcon.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Style TargetType="local:MenuFlyoutItemWithThemedIcon">
1717
<Setter Property="Padding" Value="{ThemeResource MenuFlyoutItemThemePadding}" />
1818
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
19+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
1920
<Setter Property="Template">
2021
<Setter.Value>
2122
<ControlTemplate TargetType="local:MenuFlyoutItemWithThemedIcon">

src/Files.App/UserControls/Menus/ToggleMenuFlyoutItemWithThemedIcon.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<Style TargetType="local:ToggleMenuFlyoutItemWithThemedIcon">
1717
<Setter Property="Padding" Value="{ThemeResource MenuFlyoutItemThemePadding}" />
1818
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
19+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
1920
<Setter Property="Template">
2021
<Setter.Value>
2122
<ControlTemplate TargetType="local:ToggleMenuFlyoutItemWithThemedIcon">

0 commit comments

Comments
 (0)