Skip to content

Commit ac86baa

Browse files
authored
Adding RecognizesAccessKey in remaining control styles (#10932)
1 parent b6316f1 commit ac86baa

File tree

7 files changed

+34
-29
lines changed

7 files changed

+34
-29
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
3737
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
3838
Content="{TemplateBinding Content}"
39+
RecognizesAccessKey="True"
3940
TextElement.FontSize="{TemplateBinding FontSize}" />
4041
<Grid
4142
x:Name="ChevronGrid"
@@ -96,6 +97,7 @@
9697
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
9798
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
9899
Content="{TemplateBinding Content}"
100+
RecognizesAccessKey="True"
99101
TextElement.FontSize="{TemplateBinding FontSize}" />
100102
<Grid
101103
x:Name="ChevronGrid"
@@ -156,6 +158,7 @@
156158
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
157159
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
158160
Content="{TemplateBinding Content}"
161+
RecognizesAccessKey="True"
159162
TextElement.FontSize="{TemplateBinding FontSize}" />
160163
<Grid
161164
x:Name="ChevronGrid"
@@ -219,6 +222,7 @@
219222
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
220223
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
221224
Content="{TemplateBinding Content}"
225+
RecognizesAccessKey="True"
222226
TextElement.FontSize="{TemplateBinding FontSize}" />
223227
<Grid
224228
x:Name="ChevronGrid"
@@ -331,7 +335,6 @@
331335
CornerRadius="0,0,4,4"
332336
Visibility="Collapsed">
333337
<ContentPresenter x:Name="ContentPresenter"
334-
RecognizesAccessKey="True"
335338
Margin="{TemplateBinding Padding}"
336339
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
337340
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
x:Name="ContentPresenter"
4848
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
4949
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
50+
RecognizesAccessKey="True"
5051
Content="{TemplateBinding Content}"
5152
TextElement.Foreground="{TemplateBinding Foreground}"
5253
TextElement.FontSize="{TemplateBinding FontSize}"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
x:Name="ContentPresenter"
5252
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
5353
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
54+
RecognizesAccessKey="True"
5455
Content="{TemplateBinding Content}"
5556
TextElement.Foreground="{TemplateBinding Foreground}"
5657
TextElement.FontSize="{TemplateBinding FontSize}"/>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,7 +2752,7 @@
27522752
<ColumnDefinition Width="*" />
27532753
<ColumnDefinition Width="Auto" />
27542754
</Grid.ColumnDefinitions>
2755-
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2755+
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
27562756
<Grid x:Name="ChevronGrid" Grid.Column="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
27572757
<Grid.RenderTransform>
27582758
<RotateTransform Angle="0" />
@@ -2785,7 +2785,7 @@
27852785
<ColumnDefinition Width="*" />
27862786
<ColumnDefinition Width="Auto" />
27872787
</Grid.ColumnDefinitions>
2788-
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2788+
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
27892789
<Grid x:Name="ChevronGrid" Grid.Column="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
27902790
<Grid.RenderTransform>
27912791
<RotateTransform Angle="0" />
@@ -2818,7 +2818,7 @@
28182818
<RowDefinition Height="*" />
28192819
<RowDefinition Height="Auto" />
28202820
</Grid.RowDefinitions>
2821-
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2821+
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
28222822
<Grid x:Name="ChevronGrid" Grid.Row="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
28232823
<Grid.RenderTransform>
28242824
<RotateTransform Angle="0" />
@@ -2854,7 +2854,7 @@
28542854
<RowDefinition Height="*" />
28552855
<RowDefinition Height="Auto" />
28562856
</Grid.RowDefinitions>
2857-
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2857+
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
28582858
<Grid x:Name="ChevronGrid" Grid.Row="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
28592859
<Grid.RenderTransform>
28602860
<RotateTransform Angle="0" />
@@ -2911,7 +2911,7 @@
29112911
<!-- Dummy border to store Animation factor for expander -->
29122912
<Border x:Name="AnimationFactorBorder" Width="0" Visibility="Collapsed" />
29132913
<Border x:Name="ContentPresenterBorder" Background="{DynamicResource ExpanderContentBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" CornerRadius="0,0,4,4" Visibility="Collapsed">
2914-
<ContentPresenter x:Name="ContentPresenter" RecognizesAccessKey="True" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" />
2914+
<ContentPresenter x:Name="ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" />
29152915
<Border.Resources>
29162916
<TranslateTransform x:Key="HeightAnimationNegative">
29172917
<TranslateTransform.Y>
@@ -4442,7 +4442,7 @@
44424442
<Setter.Value>
44434443
<ControlTemplate TargetType="{x:Type RepeatButton}">
44444444
<Border x:Name="ContentBorder" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding Border.CornerRadius}">
4445-
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
4445+
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
44464446
</Border>
44474447
<ControlTemplate.Triggers>
44484448
<Trigger Property="IsEnabled" Value="False">
@@ -5441,7 +5441,7 @@
54415441
<Setter.Value>
54425442
<ControlTemplate TargetType="{x:Type ToggleButton}">
54435443
<Border x:Name="ContentBorder" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding Border.CornerRadius}">
5444-
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
5444+
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
54455445
</Border>
54465446
<ControlTemplate.Triggers>
54475447
<MultiTrigger>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2652,7 +2652,7 @@
26522652
<ColumnDefinition Width="*" />
26532653
<ColumnDefinition Width="Auto" />
26542654
</Grid.ColumnDefinitions>
2655-
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2655+
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
26562656
<Grid x:Name="ChevronGrid" Grid.Column="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
26572657
<Grid.RenderTransform>
26582658
<RotateTransform Angle="0" />
@@ -2685,7 +2685,7 @@
26852685
<ColumnDefinition Width="*" />
26862686
<ColumnDefinition Width="Auto" />
26872687
</Grid.ColumnDefinitions>
2688-
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2688+
<ContentPresenter x:Name="ContentPresenter" Grid.Column="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
26892689
<Grid x:Name="ChevronGrid" Grid.Column="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
26902690
<Grid.RenderTransform>
26912691
<RotateTransform Angle="0" />
@@ -2718,7 +2718,7 @@
27182718
<RowDefinition Height="*" />
27192719
<RowDefinition Height="Auto" />
27202720
</Grid.RowDefinitions>
2721-
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2721+
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
27222722
<Grid x:Name="ChevronGrid" Grid.Row="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
27232723
<Grid.RenderTransform>
27242724
<RotateTransform Angle="0" />
@@ -2754,7 +2754,7 @@
27542754
<RowDefinition Height="*" />
27552755
<RowDefinition Height="Auto" />
27562756
</Grid.RowDefinitions>
2757-
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.FontSize="{TemplateBinding FontSize}" />
2757+
<ContentPresenter x:Name="ContentPresenter" Grid.Row="0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" RecognizesAccessKey="True" TextElement.FontSize="{TemplateBinding FontSize}" />
27582758
<Grid x:Name="ChevronGrid" Grid.Row="1" Margin="0" VerticalAlignment="Center" Background="Transparent" RenderTransformOrigin="0.5, 0.5">
27592759
<Grid.RenderTransform>
27602760
<RotateTransform Angle="0" />
@@ -2811,7 +2811,7 @@
28112811
<!-- Dummy border to store Animation factor for expander -->
28122812
<Border x:Name="AnimationFactorBorder" Width="0" Visibility="Collapsed" />
28132813
<Border x:Name="ContentPresenterBorder" Background="{DynamicResource ExpanderContentBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" CornerRadius="0,0,4,4" Visibility="Collapsed">
2814-
<ContentPresenter x:Name="ContentPresenter" RecognizesAccessKey="True" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" />
2814+
<ContentPresenter x:Name="ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" />
28152815
<Border.Resources>
28162816
<TranslateTransform x:Key="HeightAnimationNegative">
28172817
<TranslateTransform.Y>
@@ -4342,7 +4342,7 @@
43424342
<Setter.Value>
43434343
<ControlTemplate TargetType="{x:Type RepeatButton}">
43444344
<Border x:Name="ContentBorder" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding Border.CornerRadius}">
4345-
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
4345+
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
43464346
</Border>
43474347
<ControlTemplate.Triggers>
43484348
<Trigger Property="IsEnabled" Value="False">
@@ -5341,7 +5341,7 @@
53415341
<Setter.Value>
53425342
<ControlTemplate TargetType="{x:Type ToggleButton}">
53435343
<Border x:Name="ContentBorder" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding Border.CornerRadius}">
5344-
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
5344+
<ContentPresenter x:Name="ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" Content="{TemplateBinding Content}" TextElement.Foreground="{TemplateBinding Foreground}" TextElement.FontSize="{TemplateBinding FontSize}" />
53455345
</Border>
53465346
<ControlTemplate.Triggers>
53475347
<MultiTrigger>

0 commit comments

Comments
 (0)