From f910d64d8889c16232964b60e990be8b94358640 Mon Sep 17 00:00:00 2001
From: Hongxu Xu <xuhongxu96@hotmail.com>
Date: Tue, 12 Jan 2021 03:46:08 +0800
Subject: [PATCH] Handle Space and Enter KeyDown event for About button (#1459)

---
 src/Calculator/Views/MainPage.xaml     | 1 +
 src/Calculator/Views/MainPage.xaml.cpp | 8 ++++++++
 src/Calculator/Views/MainPage.xaml.h   | 1 +
 3 files changed, 10 insertions(+)

diff --git a/src/Calculator/Views/MainPage.xaml b/src/Calculator/Views/MainPage.xaml
index 8d0af90..c0febd5 100644
--- a/src/Calculator/Views/MainPage.xaml
+++ b/src/Calculator/Views/MainPage.xaml
@@ -177,6 +177,7 @@
                 <muxc:NavigationViewItem x:Name="AboutButton"
                                          x:Uid="AboutButton"
                                          Style="{StaticResource NavViewItemStyle}"
+                                         KeyDown="OnAboutButtonKeyDown"
                                          Tapped="OnAboutButtonClick">
                     <muxc:NavigationViewItem.Icon>
                         <FontIcon FontFamily="{StaticResource CalculatorFontFamily}" Glyph="&#xe946;"/>
diff --git a/src/Calculator/Views/MainPage.xaml.cpp b/src/Calculator/Views/MainPage.xaml.cpp
index f0c0b5e..876ff72 100644
--- a/src/Calculator/Views/MainPage.xaml.cpp
+++ b/src/Calculator/Views/MainPage.xaml.cpp
@@ -432,6 +432,14 @@ void MainPage::OnAboutButtonClick(Object ^ sender, ItemClickEventArgs ^ e)
     ShowAboutPage();
 }
 
+void MainPage::OnAboutButtonKeyDown(Object ^ sender, KeyRoutedEventArgs ^ e)
+{
+    if (e->Key == VirtualKey::Space || e->Key == VirtualKey::Enter)
+    {
+        ShowAboutPage();
+    }
+}
+
 void MainPage::OnAboutFlyoutOpened(_In_ Object ^ sender, _In_ Object ^ e)
 {
     // Keep Ignoring Escape till the About page flyout is opened
diff --git a/src/Calculator/Views/MainPage.xaml.h b/src/Calculator/Views/MainPage.xaml.h
index 2b71bdd..88451d3 100644
--- a/src/Calculator/Views/MainPage.xaml.h
+++ b/src/Calculator/Views/MainPage.xaml.h
@@ -55,6 +55,7 @@ public
             _In_ Microsoft::UI::Xaml::Controls::NavigationViewItemInvokedEventArgs ^ e);
 
         void OnAboutButtonClick(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::Controls::ItemClickEventArgs ^ e);
+        void OnAboutButtonKeyDown(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::Input::KeyRoutedEventArgs ^ e);
         void OnAboutFlyoutOpened(_In_ Platform::Object ^ sender, _In_ Platform::Object ^ e);
         void OnAboutFlyoutClosed(_In_ Platform::Object ^ sender, _In_ Platform::Object ^ e);
         void AlwaysOnTopButtonClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e);