Fix search failing.

VPKSoft · Aug 27, 2022 · 04ddb04 · 04ddb04
1 parent 53833ea
commit 04ddb04
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/amp.EtoForms/FormMain.Events.cs b/amp.EtoForms/FormMain.Events.cs
@@ -58,8 +58,9 @@ private async void FormMain_KeyDown(object? sender, KeyEventArgs e)
     {
         if (Equals(sender, tbSearch))
         {
-            if (e.Key is Keys.Up or Keys.Down or Keys.PageDown or Keys.PageUp or Keys.Equal or Keys.F2 or Keys.F6
-                    or Keys.F8 or Keys.F9 || !e.IsChar)
+            if (e.Key is Keys.Up or Keys.Down or Keys.PageDown or Keys.PageUp or Keys.Equal or
+                Keys.F1 or Keys.F2 or Keys.F3 or Keys.F4 or Keys.F5 or Keys.F6 or Keys.F7 or Keys.F8 or Keys.F9 or
+                Keys.Escape or Keys.Enter or Keys.Add or Keys.Multiply)
             {
                 if (gvAudioTracks.SelectedItem == null && gvAudioTracks.DataStore.Any())
                 {
@@ -81,6 +82,13 @@ private async void FormMain_KeyDown(object? sender, KeyEventArgs e)
             return;
         }
 
+        if (e.Key == Keys.F && e.Modifiers.HasFlag(Application.Instance.CommonModifier))
+        {
+            tbSearch.Focus();
+            e.Handled = true;
+            return;
+        }
+
         if (e.Key is Keys.Add or Keys.Multiply)
         {
             var selectedTracks = tracks.Where(f => SelectedAlbumTrackIds.Contains(f.Id)).Select(f => f.Id);