From 480ad7b13bf47d2a2a137a510dae76cdf22fd329 Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Thu, 28 Jul 2022 15:02:15 +0200 Subject: [PATCH] [BUG] Fix alt+f4 killing the menu but not the app (#427), version 1.3.0.10 --- Business/KeyboardInput.cs | 2 ++ Properties/AssemblyInfo.cs | 4 ++-- UserInterface/Menu.cs | 1 + Utilities/DataGridViewExtensions.cs | 1 - 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Business/KeyboardInput.cs b/Business/KeyboardInput.cs index 4eac6ec..ad608b6 100644 --- a/Business/KeyboardInput.cs +++ b/Business/KeyboardInput.cs @@ -89,6 +89,7 @@ namespace SystemTrayMenu.Handler case Keys.Up: case Keys.Down: case Keys.Escape: + case Keys.Alt | Keys.F4: SelectByKey(keys); break; case Keys.Control | Keys.F: @@ -374,6 +375,7 @@ namespace SystemTrayMenu.Handler break; case Keys.Escape: + case Keys.Alt | Keys.F4: RowDeselected(iRowBefore, dgvBefore); iMenuKey = 0; iRowKey = -1; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 2d271ef..55fe56d 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.3.0.9")] -[assembly: AssemblyFileVersion("1.3.0.9")] +[assembly: AssemblyVersion("1.3.0.10")] +[assembly: AssemblyFileVersion("1.3.0.10")] diff --git a/UserInterface/Menu.cs b/UserInterface/Menu.cs index be62042..6bbaa61 100644 --- a/UserInterface/Menu.cs +++ b/UserInterface/Menu.cs @@ -698,6 +698,7 @@ namespace SystemTrayMenu.UserInterface case Keys.Left: case Keys.Right: case Keys.Escape: + case Keys.Alt | Keys.F4: case Keys.Control | Keys.F: case Keys.Tab: case Keys.Tab | Keys.Shift: diff --git a/Utilities/DataGridViewExtensions.cs b/Utilities/DataGridViewExtensions.cs index 18447e5..92cd18b 100644 --- a/Utilities/DataGridViewExtensions.cs +++ b/Utilities/DataGridViewExtensions.cs @@ -6,7 +6,6 @@ namespace SystemTrayMenu.Utilities { using System.Data; using System.Drawing; - using System.Linq; using System.Windows.Forms; using SystemTrayMenu.DataClasses;