changed behavior for ESC key in setup dialog

winbench · Jul 6, 2018 · 4ae979b · 4ae979b
1 parent 53f8747
commit 4ae979b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/BenchManager/BenchDashboard/SetupForm.cs b/BenchManager/BenchDashboard/SetupForm.cs
@@ -653,11 +653,19 @@ private async void KeyDownDownHandler(object sender, KeyEventArgs e)
                 {
                     var cancelation = core.Cancelation;
                     if (cancelation != null) cancelation.Cancel();
+                    return;
                 }
-                else
+                if (BusyPanelVisible)
+                {
+                    BusyPanelVisible = false;
+                    return;
+                }
+                if (appList.HasSearchFilter)
                 {
-                    Close();
+                    appList.ResetSearchFilter();
+                    return;
                 }
+                Close();
             }
             else if (e.KeyCode == Keys.F && e.Modifiers == Keys.Control)
                 appList.FocusSearchBox();

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,13 @@ Add a link to the GitHub diff like
 ### Added
 * Menu item _View_ &rarr; _Last Logfile_
 
+### Changed
+* Behavior of ESC key in setup dialog:
+    1. Cancel running task
+    2. Close task progress view
+    3. Clear search
+    4. Close setup dialog
+
 ### Fixed
 * Apply search filter after reloading the Bench configuration
   ([#134](https://github.com/mastersign/bench/issues/134))