Merge pull request #1980 from thoemmi/issue1976-escape-messagedialog

cancel message dialog on Esc
MahApps · Jun 14, 2015 · 2613cf9 · 2613cf9
2 parents 18de751 + ec6596f
commit 2613cf9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/MahApps.Metro/Controls/Dialogs/MessageDialog.cs b/MahApps.Metro/Controls/Dialogs/MessageDialog.cs
@@ -56,6 +56,8 @@ internal Task<MessageDialogResult> WaitForButtonPressAsync()
             RoutedEventHandler secondAuxHandler = null;
             KeyEventHandler secondAuxKeyHandler = null;
 
+            KeyEventHandler escapeKeyHandler = null;
+
             Action cleanUpHandlers = () => {
                 PART_NegativeButton.Click -= negativeHandler;
                 PART_AffirmativeButton.Click -= affirmativeHandler;
@@ -66,6 +68,8 @@ internal Task<MessageDialogResult> WaitForButtonPressAsync()
                 PART_AffirmativeButton.KeyDown -= affirmativeKeyHandler;
                 PART_FirstAuxiliaryButton.KeyDown -= firstAuxKeyHandler;
                 PART_SecondAuxiliaryButton.KeyDown -= secondAuxKeyHandler;
+
+                KeyDown -= escapeKeyHandler;
             };
 
             negativeKeyHandler = (sender, e) => {
@@ -136,6 +140,21 @@ internal Task<MessageDialogResult> WaitForButtonPressAsync()
                 e.Handled = true;
             };
 
+            escapeKeyHandler = (sender, e) => {
+                if (e.Key == Key.Escape)
+                {
+                    cleanUpHandlers();
+
+                    tcs.TrySetResult(ButtonStyle == MessageDialogStyle.Affirmative ? MessageDialogResult.Affirmative : MessageDialogResult.Negative);
+                }
+                else if (e.Key == Key.Enter)
+                {
+                    cleanUpHandlers();
+
+                    tcs.TrySetResult(MessageDialogResult.Affirmative);
+                }
+            };
+
             PART_NegativeButton.KeyDown += negativeKeyHandler;
             PART_AffirmativeButton.KeyDown += affirmativeKeyHandler;
             PART_FirstAuxiliaryButton.KeyDown += firstAuxKeyHandler;
@@ -146,6 +165,8 @@ internal Task<MessageDialogResult> WaitForButtonPressAsync()
             PART_FirstAuxiliaryButton.Click += firstAuxHandler;
             PART_SecondAuxiliaryButton.Click += secondAuxHandler;
 
+            KeyDown += escapeKeyHandler;
+
             return tcs.Task;
         }
 

diff --git a/docs/release-notes/1.2.0.md b/docs/release-notes/1.2.0.md
@@ -65,4 +65,5 @@ This is a bug fix and feature release of MahApps.Metro v1.2.0.
 - Fixed MVVM Binding for `OnLabel`/`OffLabel` at `ToggleSwitch` #1867 #1945
 - Fixed focus problem with `NumericUpDown` #1903 #1959
 - Fixed JIT Compiler encountered an internal limitation #1919 #1971
-- Fixed access keys in `CheckBox`, `RadioButton`, and `GroupBox` #1979
+- Fixed access keys in `CheckBox`, `RadioButton`, and `GroupBox` #1979
+- Fixed close Message dialog when pressing **Enter** or **Esc** #1976 #1980