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

Use automation peer to trigger back button click in accelerator

Browse source
This commit is contained in:
Kenny Guo 2021-07-30 10:28:37 +08:00
commit 1113037013
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/Views/MainPage.xaml.cs
View file

@ -578,7 +578,7 @@ namespace CalculatorApp
NarratorNotifier.Announce(announcement); NarratorNotifier.Announce(announcement);
} }
private void TitleBarBackButtonClick(object sender) private void TitleBarBackButtonClick(object sender, RoutedEventArgs e)
{ {
CloseSettingsPopup(); CloseSettingsPopup();
} }

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

@ -7,6 +7,8 @@ using Windows.UI;
using Windows.UI.Core; using Windows.UI.Core;
using Windows.UI.ViewManagement; using Windows.UI.ViewManagement;
using Windows.UI.Xaml; using Windows.UI.Xaml;
using Windows.UI.Xaml.Automation.Peers;
using Windows.UI.Xaml.Automation.Provider;
using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media;
@ -51,9 +53,7 @@ namespace CalculatorApp
})); }));
public event Windows.UI.Xaml.RoutedEventHandler AlwaysOnTopClick; public event Windows.UI.Xaml.RoutedEventHandler AlwaysOnTopClick;
public event Windows.UI.Xaml.RoutedEventHandler BackButtonClick;
public delegate void BackButtonClickEventHandler(object sender);
public event BackButtonClickEventHandler BackButtonClick;
private void OnLoaded(object sender, RoutedEventArgs e) private void OnLoaded(object sender, RoutedEventArgs e)
{ {
@ -103,7 +103,9 @@ namespace CalculatorApp
{ {
if (!e.Handled && BackButton.IsEnabled) if (!e.Handled && BackButton.IsEnabled)
{ {
InvokeBackButton(sender) ; var buttonPeer = new ButtonAutomationPeer(BackButton);
IInvokeProvider invokeProvider = buttonPeer.GetPattern(PatternInterface.Invoke) as IInvokeProvider;
invokeProvider.Invoke();
e.Handled = true; e.Handled = true;
} }
@ -229,15 +231,9 @@ namespace CalculatorApp
AlwaysOnTopClick?.Invoke(this, e); AlwaysOnTopClick?.Invoke(this, e);
} }
// Called when BackButton invoked, for example, by clicking, access key and etc.
private void InvokeBackButton(object sender)
{
BackButtonClick?.Invoke(this);
}
private void BackButton_Click(object sender, RoutedEventArgs e) private void BackButton_Click(object sender, RoutedEventArgs e)
{ {
InvokeBackButton(sender); BackButtonClick?.Invoke(this, e);
} }
// Dependency properties for the color of the system title bar buttons // Dependency properties for the color of the system title bar buttons