From 99780a0c676ad984094f5f55d4aef4eba72d805d Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 23 Oct 2021 14:50:26 +0200
Subject: [PATCH] Display access key in ToggleButton, ToggleSwitch.

---
 samples/ControlCatalog/Pages/ToggleSwitchPage.xaml    | 6 +++---
 src/Avalonia.Themes.Default/ToggleButton.xaml         | 1 +
 src/Avalonia.Themes.Default/ToggleSwitch.xaml         | 1 +
 src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml | 1 +
 src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
index 161ee2ee16..7a65275a8e 100644
--- a/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
+++ b/samples/ControlCatalog/Pages/ToggleSwitchPage.xaml
@@ -14,7 +14,7 @@
 
     <Border Classes="Thin">
       <StackPanel>
-        <ToggleSwitch Content="headered" IsChecked="true" Margin="10"/>
+        <ToggleSwitch Content="h_eadered" IsChecked="true" Margin="10"/>
         <TextBox Classes="CodeBox"
           Text="&lt;ToggleSwitch&gt;headered&lt;/ToggleSwitch&gt;"/>
       </StackPanel>
@@ -24,7 +24,7 @@
 
     <Border Classes="Thin">
       <StackPanel>
-        <ToggleSwitch Content="Custom"
+        <ToggleSwitch Content="_Custom"
           OnContent="On"
           OffContent="Off"
           Margin="10"/>
@@ -40,7 +40,7 @@ ContentOff=&quot;Off&quot; /&gt;"
 
     <Border Classes="Thin">
       <StackPanel>
-        <ToggleSwitch Content="Just Click!" Margin="10">
+        <ToggleSwitch Content="_Just Click!" Margin="10">
           <ToggleSwitch.OnContent>
             <Image Source="/Assets/hirsch-899118_640.jpg" Height="32"/>
           </ToggleSwitch.OnContent>
diff --git a/src/Avalonia.Themes.Default/ToggleButton.xaml b/src/Avalonia.Themes.Default/ToggleButton.xaml
index ffebd4f63d..b14a239c35 100644
--- a/src/Avalonia.Themes.Default/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Default/ToggleButton.xaml
@@ -17,6 +17,7 @@
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Content="{TemplateBinding Content}"
                           Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
                           TextBlock.Foreground="{TemplateBinding Foreground}"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
diff --git a/src/Avalonia.Themes.Default/ToggleSwitch.xaml b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
index f11f77df5a..305f1b1814 100644
--- a/src/Avalonia.Themes.Default/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Default/ToggleSwitch.xaml
@@ -87,6 +87,7 @@
             Grid.Row="0"
             Content="{TemplateBinding Content}"
             ContentTemplate="{TemplateBinding ContentTemplate}"
+            RecognizesAccessKey="True"
             VerticalAlignment="Top"/>
 
           <Grid Grid.Row="1"
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
index b1d07059b8..5ad2b3a6a7 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleButton.xaml
@@ -34,6 +34,7 @@
                           Content="{TemplateBinding Content}"
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
       </ControlTemplate>
diff --git a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
index ef54769f22..a9e6569158 100644
--- a/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
+++ b/src/Avalonia.Themes.Fluent/Controls/ToggleSwitch.xaml
@@ -53,6 +53,7 @@
             Grid.Row="0"
             Content="{TemplateBinding Content}"
             ContentTemplate="{TemplateBinding ContentTemplate}"
+            RecognizesAccessKey="True"
             VerticalAlignment="Top"/>
 
           <Grid Grid.Row="1"