From aa6b41e12e7335ae3903673c445d2b571477fa25 Mon Sep 17 00:00:00 2001
From: Kenny Guo <kennyguo@microsoft.com>
Date: Fri, 30 Jul 2021 09:43:19 +0800
Subject: [PATCH] Remove some accelerators of back button

---
 src/Calculator/Views/TitleBar.xaml    |  7 +------
 src/Calculator/Views/TitleBar.xaml.cs | 13 -------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/Calculator/Views/TitleBar.xaml b/src/Calculator/Views/TitleBar.xaml
index 5a4ce43e..080e2a6c 100644
--- a/src/Calculator/Views/TitleBar.xaml
+++ b/src/Calculator/Views/TitleBar.xaml
@@ -57,12 +57,7 @@
                     Click="BackButton_Click"
                     Content="&#xE72B;"
                     Visibility="Collapsed"
-                    IsEnabled="False">
-                <Button.KeyboardAccelerators>
-                    <KeyboardAccelerator Key="Left" Modifiers="Menu"/>
-                    <KeyboardAccelerator Key="Escape" Modifiers="None"/>
-                </Button.KeyboardAccelerators>
-            </Button>
+                    IsEnabled="False"/>
 
             <Grid x:Name="BackgroundElement"
                   Grid.Column="1"
diff --git a/src/Calculator/Views/TitleBar.xaml.cs b/src/Calculator/Views/TitleBar.xaml.cs
index 1320b7d5..e498a878 100644
--- a/src/Calculator/Views/TitleBar.xaml.cs
+++ b/src/Calculator/Views/TitleBar.xaml.cs
@@ -67,8 +67,6 @@ namespace CalculatorApp
 
             // Register the system back requested event
             SystemNavigationManager.GetForCurrentView().BackRequested += System_BackRequested;
-            // Register the mouse back button event
-            Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
 
             // Register RequestedTheme changed callback to update title bar system button colors.
             m_rootFrameRequestedThemeCallbackToken =
@@ -96,22 +94,11 @@ namespace CalculatorApp
             Window.Current.Activated -= OnWindowActivated;
 
             SystemNavigationManager.GetForCurrentView().BackRequested -= System_BackRequested;
-            Window.Current.CoreWindow.PointerPressed -= CoreWindow_PointerPressed;
 
             Utils.ThemeHelper.
                 UnregisterAppThemeChangedCallback(m_rootFrameRequestedThemeCallbackToken);
         }
 
-        private void CoreWindow_PointerPressed(CoreWindow sender, PointerEventArgs e)
-        {
-            if (e.CurrentPoint.Properties.IsXButton1Pressed && BackButton.IsEnabled)
-            {
-                InvokeBackButton(sender);
-
-                e.Handled = true;
-            }
-        }
-
         private void System_BackRequested(object sender, BackRequestedEventArgs e)
         {
             if (!e.Handled && BackButton.IsEnabled)