File tree Expand file tree Collapse file tree 5 files changed +20
-0
lines changed Expand file tree Collapse file tree 5 files changed +20
-0
lines changed Original file line number Diff line number Diff line change 31
31
<Setter Target =" HighContrastAdjustment" Value =" None" />
32
32
</Style >
33
33
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
+
34
50
<Style BasedOn =" {StaticResource DefaultComboBoxStyle}" TargetType =" uc:ComboBoxEx" />
35
51
36
52
<ResourceDictionary .MergedDictionaries>
Original file line number Diff line number Diff line change 7
7
<Style x : Key =" MenuFlyoutSubItemWithImageStyle" TargetType =" MenuFlyoutSubItem" >
8
8
<Setter Property =" Padding" Value =" {ThemeResource MenuFlyoutItemThemePadding}" />
9
9
<Setter Property =" FontSize" Value =" {ThemeResource ControlContentThemeFontSize}" />
10
+ <Setter Property =" FontFamily" Value =" {ThemeResource ContentControlThemeFontFamily}" />
10
11
<Setter Property =" Template" >
11
12
<Setter .Value>
12
13
<ControlTemplate TargetType =" MenuFlyoutSubItem" >
Original file line number Diff line number Diff line change 15
15
<Style TargetType =" local:MenuFlyoutItemWithImage" >
16
16
<Setter Property =" Padding" Value =" {ThemeResource MenuFlyoutItemThemePadding}" />
17
17
<Setter Property =" FontSize" Value =" {ThemeResource ControlContentThemeFontSize}" />
18
+ <Setter Property =" FontFamily" Value =" {ThemeResource ContentControlThemeFontFamily}" />
18
19
<Setter Property =" Template" >
19
20
<Setter .Value>
20
21
<ControlTemplate TargetType =" local:MenuFlyoutItemWithImage" >
Original file line number Diff line number Diff line change 16
16
<Style TargetType =" local:MenuFlyoutItemWithThemedIcon" >
17
17
<Setter Property =" Padding" Value =" {ThemeResource MenuFlyoutItemThemePadding}" />
18
18
<Setter Property =" FontSize" Value =" {ThemeResource ControlContentThemeFontSize}" />
19
+ <Setter Property =" FontFamily" Value =" {ThemeResource ContentControlThemeFontFamily}" />
19
20
<Setter Property =" Template" >
20
21
<Setter .Value>
21
22
<ControlTemplate TargetType =" local:MenuFlyoutItemWithThemedIcon" >
Original file line number Diff line number Diff line change 16
16
<Style TargetType =" local:ToggleMenuFlyoutItemWithThemedIcon" >
17
17
<Setter Property =" Padding" Value =" {ThemeResource MenuFlyoutItemThemePadding}" />
18
18
<Setter Property =" FontSize" Value =" {ThemeResource ControlContentThemeFontSize}" />
19
+ <Setter Property =" FontFamily" Value =" {ThemeResource ContentControlThemeFontFamily}" />
19
20
<Setter Property =" Template" >
20
21
<Setter .Value>
21
22
<ControlTemplate TargetType =" local:ToggleMenuFlyoutItemWithThemedIcon" >
You can’t perform that action at this time.
0 commit comments