Disable forwarding the Escape event (#10697)

microsoft · Apr 13, 2021 · 28e9f16 · 28e9f16
1 parent 04101d2
commit 28e9f16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs b/src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
@@ -54,7 +54,7 @@ public void StartUserSession()
             }
         }
 
-        public void EndUserSession()
+        public bool EndUserSession()
         {
             lock (_colorPickerVisibilityLock)
             {
@@ -70,7 +70,11 @@ public void EndUserSession()
                     }
 
                     SessionEventHelper.End();
+
+                    return true;
                 }
+
+                return false;
             }
         }
 

diff --git a/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs b/src/modules/colorPicker/ColorPickerUI/Keyboard/KeyboardMonitor.cs
@@ -72,7 +72,7 @@ private void Hook_KeyboardPressed(object sender, GlobalKeyboardHookEventArgs e)
             // ESC pressed
             if (virtualCode == KeyInterop.VirtualKeyFromKey(Key.Escape))
             {
-                _appStateHandler.EndUserSession();
+                e.Handled = _appStateHandler.EndUserSession();
                 return;
             }