github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove some accelerators of back button

Browse source
This commit is contained in:
Kenny Guo 2021-07-30 09:43:19 +08:00
commit aa6b41e12e
2 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Calculator/Views/TitleBar.xaml
View file

@ -57,12 +57,7 @@
Click="BackButton_Click" Click="BackButton_Click"
Content="" Content=""
Visibility="Collapsed" Visibility="Collapsed"
IsEnabled="False"> IsEnabled="False"/>
<Button.KeyboardAccelerators>
<KeyboardAccelerator Key="Left" Modifiers="Menu"/>
<KeyboardAccelerator Key="Escape" Modifiers="None"/>
</Button.KeyboardAccelerators>
</Button>
<Grid x:Name="BackgroundElement" <Grid x:Name="BackgroundElement"
Grid.Column="1" Grid.Column="1"

13
src/Calculator/Views/TitleBar.xaml.cs
View file

@ -67,8 +67,6 @@ namespace CalculatorApp
// Register the system back requested event // Register the system back requested event
SystemNavigationManager.GetForCurrentView().BackRequested += System_BackRequested; 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. // Register RequestedTheme changed callback to update title bar system button colors.
m_rootFrameRequestedThemeCallbackToken = m_rootFrameRequestedThemeCallbackToken =
@ -96,22 +94,11 @@ namespace CalculatorApp
Window.Current.Activated -= OnWindowActivated; Window.Current.Activated -= OnWindowActivated;
SystemNavigationManager.GetForCurrentView().BackRequested -= System_BackRequested; SystemNavigationManager.GetForCurrentView().BackRequested -= System_BackRequested;
Window.Current.CoreWindow.PointerPressed -= CoreWindow_PointerPressed;
Utils.ThemeHelper. Utils.ThemeHelper.
UnregisterAppThemeChangedCallback(m_rootFrameRequestedThemeCallbackToken); 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) private void System_BackRequested(object sender, BackRequestedEventArgs e)
{ {
if (!e.Handled && BackButton.IsEnabled) if (!e.Handled && BackButton.IsEnabled)