From 5028b22fb30ec80ba2405649b68fbae84389ab92 Mon Sep 17 00:00:00 2001
From: Peter Spada <spadapet@hotmail.com>
Date: Fri, 18 Mar 2022 15:25:35 -0700
Subject: Brush editor popup needs to handle ESC key before VS can handle it

---
 Xamarin.PropertyEditing.Windows/BrushEditorControl.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Xamarin.PropertyEditing.Windows/BrushEditorControl.cs b/Xamarin.PropertyEditing.Windows/BrushEditorControl.cs
index ff1b9c8..4cc2acf 100644
--- a/Xamarin.PropertyEditing.Windows/BrushEditorControl.cs
+++ b/Xamarin.PropertyEditing.Windows/BrushEditorControl.cs
@@ -36,9 +36,10 @@ namespace Xamarin.PropertyEditing.Windows
 			this.brushBoxPopup.Closed += (s, e) => {
 				this.brushBoxButton.Focus ();
 			};
-			this.brushBoxPopup.KeyUp += (s, e) => {
+			this.brushBoxPopup.PreviewKeyDown += (s, e) => {
 				if (e.Key == Key.Escape) {
 					this.brushBoxPopup.IsOpen = false;
+					e.Handled = true;
 				}
 			};
 		}
-- 
cgit v1.2.3