From 798d30ea27aa24da41e569da4b4d21bd76e36a3d Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Sun, 19 Nov 2023 17:04:29 +0800
Subject: [PATCH 1/2] Ignore modifier key when using key + number to launch
 result

- close #2191
- close #2425
---
 Flow.Launcher/ViewModel/MainViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index c832c258d..7dcd2f4d2 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -285,7 +285,8 @@ namespace Flow.Launcher.ViewModel
             }
             var hideWindow = await result.ExecuteAsync(new ActionContext
                 {
-                    SpecialKeyState = GlobalHotkey.CheckModifiers()
+                    // not null means pressing modifier key + number, should ignore the modifier key
+                    SpecialKeyState = index is not null ? new SpecialKeyState() : GlobalHotkey.CheckModifiers()
                 })
                 .ConfigureAwait(false);
 

From 6625e911829a42c0d4115ef6a8c5db2dad8438df Mon Sep 17 00:00:00 2001
From: VictoriousRaptor <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Mon, 20 Nov 2023 23:20:59 +0800
Subject: [PATCH 2/2] Use default SpecialKeyState

---
 Flow.Launcher.Plugin/ActionContext.cs    | 7 +++++++
 Flow.Launcher/ViewModel/MainViewModel.cs | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher.Plugin/ActionContext.cs b/Flow.Launcher.Plugin/ActionContext.cs
index d6ba4894e..e31c8e31d 100644
--- a/Flow.Launcher.Plugin/ActionContext.cs
+++ b/Flow.Launcher.Plugin/ActionContext.cs
@@ -50,5 +50,12 @@ namespace Flow.Launcher.Plugin
                    (AltPressed ? ModifierKeys.Alt : ModifierKeys.None) |
                    (WinPressed ? ModifierKeys.Windows : ModifierKeys.None);
         }
+
+        public static readonly SpecialKeyState Default = new () {
+            CtrlPressed = false,
+            ShiftPressed = false,
+            AltPressed = false,
+            WinPressed = false
+        };
     }
 }
diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModel/MainViewModel.cs
index 7dcd2f4d2..61bf0c4dc 100644
--- a/Flow.Launcher/ViewModel/MainViewModel.cs
+++ b/Flow.Launcher/ViewModel/MainViewModel.cs
@@ -286,7 +286,7 @@ namespace Flow.Launcher.ViewModel
             var hideWindow = await result.ExecuteAsync(new ActionContext
                 {
                     // not null means pressing modifier key + number, should ignore the modifier key
-                    SpecialKeyState = index is not null ? new SpecialKeyState() : GlobalHotkey.CheckModifiers()
+                    SpecialKeyState = index is not null ? SpecialKeyState.Default : GlobalHotkey.CheckModifiers()
                 })
                 .ConfigureAwait(false);