diff --git a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs index 67d7365b..f2cb5458 100644 --- a/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs +++ b/Wino.Mail.WinUI/Views/Mail/MailListPage.xaml.cs @@ -559,6 +559,11 @@ public sealed partial class MailListPage : MailListPageAbstract, { await ViewModel.MailCollection.ToggleSelectAllAsync(); } + else if (args.Key == VirtualKey.Escape) + { + // Unselect the selected items. + await ViewModel.MailCollection.UnselectAllAsync(); + } else { // Check keyboard shortcuts from service. diff --git a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml index 6b84a962..3784fd89 100644 --- a/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml +++ b/Wino.Mail.WinUI/Views/Mail/MailRenderingPage.xaml @@ -19,6 +19,9 @@ IsDarkEditor="{x:Bind ViewModel.IsDarkWebviewRenderer, Mode=TwoWay}" mc:Ignorable="d"> + + + - + + + + + (this); WeakReferenceMessenger.Default.Unregister(this); } + + private void EscapeInvoked(Microsoft.UI.Xaml.Input.KeyboardAccelerator sender, Microsoft.UI.Xaml.Input.KeyboardAcceleratorInvokedEventArgs args) + { + WeakReferenceMessenger.Default.Send(new ClearMailSelectionsRequested()); + } }