[DebuggerVisualizers] Escape key closes PreviewWindow

1 files changed, 9 insertions, 0 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewWindowManager.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewWindowManager.cs
index aa3b396bef..bf5ee2e886 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewWindowManager.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.PreviewVisualizers/PreviewWindowManager.cs
@@ -27,6 +27,7 @@ using System;
 using MonoDevelop.Ide;
 using Mono.Debugging.Client;
 using MonoDevelop.Components;
+using MonoDevelop.Components.Commands;
 
 namespace MonoDevelop.Debugger
 {
@@ -67,11 +68,19 @@ namespace MonoDevelop.Debugger
 				IdeApp.Workbench.RootWindow.Destroyed += (sender, e) => DestroyWindow ();
 				IdeApp.Workbench.RootWindow.FocusOutEvent += HandleFocusOutEvent;
 			}
+			IdeApp.CommandService.KeyPressed += HandleKeyPressed;
 			DebuggingService.StoppedEvent += delegate {
 				DestroyWindow ();
 			};
 		}
 
+		static void HandleKeyPressed (object sender, KeyPressArgs e)
+		{
+			if (e.Key == Gdk.Key.Escape) {
+				DestroyWindow ();
+			}
+		}
+
 		static void HandleFocusOutEvent (object o, Gtk.FocusOutEventArgs args)
 		{
 			if (IdeApp.Workbench.RootWindow == null || !IdeApp.Workbench.RootWindow.HasFocus) {