From add175730b17f1d2eafff321d3b708138de59820 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Fri, 24 Dec 2021 09:01:07 +0900
Subject: [PATCH 1/3] Add Recommend Hotkeys Item in Setting

---
 Flow.Launcher/Languages/en.xaml  |   2 +
 Flow.Launcher/SettingWindow.xaml | 310 +++++++++++++++++--------------
 2 files changed, 172 insertions(+), 140 deletions(-)

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 2b9d830002b..beb2ce981b5 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -106,6 +106,8 @@
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkey">Flow Launcher Hotkey</system:String>
     <system:String x:Key="flowlauncherHotkeyToolTip">Enter shortcut to show/hide Flow Launcher.</system:String>
+    <system:String x:Key="flowlauncherSpecificHotkey">Recommended Hotkeys</system:String>
+    <system:String x:Key="flowlauncherSpecificHotkeyToolTip">List of recommended hotkeys.</system:String>
     <system:String x:Key="openResultModifiers">Open Result Modifier Key</system:String>
     <system:String x:Key="openResultModifiersToolTip">Select a modifier key to open selected result via keyboard.</system:String>
     <system:String x:Key="showOpenResultHotkey">Show Hotkey</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e15d5285cd0..52be01c02f5 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -1998,11 +1998,8 @@
                             <Grid Margin="5,18,18,10">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="43" />
-                                    <RowDefinition Height="80" />
-                                    <RowDefinition Height="146" />
-                                    <RowDefinition Height="50" />
                                     <RowDefinition Height="*" />
-                                    <RowDefinition Height="50" />
+                                    <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
                                 <TextBlock
                                     Grid.Row="0"
@@ -2013,147 +2010,180 @@
                                     TextAlignment="left" />
 
                                 <StackPanel Grid.Row="1">
-                                    <Border Margin="0,12,0,0" Style="{DynamicResource SettingGroupBox}">
-                                        <ItemsControl Style="{StaticResource SettingGrid}">
-                                            <StackPanel Style="{StaticResource TextPanel}">
-                                                <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
-                                                <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" />
-                                            </StackPanel>
-                                            <flowlauncher:HotkeyControl
-                                                x:Name="HotkeyControl"
-                                                Grid.Row="0"
-                                                Grid.Column="2"
-                                                Width="300"
-                                                Height="35"
-                                                Margin="0,0,0,0"
-                                                HorizontalAlignment="Right"
-                                                HorizontalContentAlignment="Right"
-                                                GotFocus="OnHotkeyControlFocused"
-                                                Loaded="OnHotkeyControlLoaded"
-                                                LostFocus="OnHotkeyControlFocusLost" />
+                                    <Border
+                                        Margin="0,12,0,0"
+                                        Padding="0"
+                                        CornerRadius="5"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <StackPanel Orientation="Vertical">
+                                            <Border
+                                                Margin="0"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <StackPanel Style="{StaticResource TextPanel}">
+                                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherHotkey}" />
+                                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherHotkeyToolTip}" />
+                                                    </StackPanel>
+                                                    <flowlauncher:HotkeyControl
+                                                        x:Name="HotkeyControl"
+                                                        Grid.Row="0"
+                                                        Grid.Column="2"
+                                                        Width="300"
+                                                        Height="35"
+                                                        Margin="0,0,0,0"
+                                                        HorizontalAlignment="Right"
+                                                        HorizontalContentAlignment="Right"
+                                                        GotFocus="OnHotkeyControlFocused"
+                                                        Loaded="OnHotkeyControlLoaded"
+                                                        LostFocus="OnHotkeyControlFocusLost" />
 
-                                            <TextBlock Style="{StaticResource Glyph}">
-                                                &#xeda7;
-                                            </TextBlock>
-                                        </ItemsControl>
-                                    </Border>
-                                </StackPanel>
+                                                    <TextBlock Style="{StaticResource Glyph}">
+                                                        &#xeda7;
+                                                    </TextBlock>
+                                                </ItemsControl>
+                                            </Border>
 
-                                <Border
-                                    Grid.Row="2"
-                                    Margin="0,12,0,0"
-                                    Padding="0"
-                                    CornerRadius="5"
-                                    Style="{DynamicResource SettingGroupBox}">
-                                    <StackPanel Orientation="Vertical">
-                                        <Border
-                                            Margin="0"
-                                            BorderThickness="0"
-                                            Style="{DynamicResource SettingGroupBox}">
-                                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                                <StackPanel Style="{StaticResource TextPanel}">
-                                                    <TextBlock
-                                                        Grid.Column="1"
+                                            <Separator
+                                                Width="Auto"
+                                                BorderThickness="1"
+                                                Style="{StaticResource SettingSeparatorStyle}" />
+                                            <Border
+                                                Margin="0"
+                                                Padding="40,10,0,14"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <StackPanel Style="{StaticResource TextPanel}">
+                                                        <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource flowlauncherSpecificHotkey}" />
+                                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource flowlauncherSpecificHotkeyToolTip}" />
+                                                    </StackPanel>
+                                                    <ComboBox
+                                                        Grid.Column="2"
+                                                        Width="180"
+                                                        Margin="0,4,18,4"
                                                         VerticalAlignment="Center"
-                                                        Style="{DynamicResource SettingTitleLabel}"
-                                                        Text="{DynamicResource openResultModifiers}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
-                                                </StackPanel>
-                                                <ComboBox
-                                                    Grid.Column="2"
-                                                    Width="120"
-                                                    Margin="0,0,18,0"
-                                                    FontSize="14"
-                                                    ItemsSource="{Binding OpenResultModifiersList}"
-                                                    SelectedItem="{Binding Settings.OpenResultModifiers}" />
-                                            </ItemsControl>
-                                        </Border>
+                                                        FontSize="14">
+                                                        <MenuItem Header="hello" />
+                                                    </ComboBox>
+                                                </ItemsControl>
+                                            </Border>
+                                        </StackPanel>
+                                    </Border>
 
-                                        <Separator
-                                            Width="Auto"
-                                            BorderThickness="1"
-                                            Style="{StaticResource SettingSeparatorStyle}" />
-                                        <Border
-                                            Margin="0"
-                                            Padding="0,10,0,0"
-                                            BorderThickness="0"
-                                            Style="{DynamicResource SettingGroupBox}">
-                                            <ItemsControl Style="{StaticResource SettingGrid}">
-                                                <StackPanel Style="{StaticResource TextPanel}">
-                                                    <TextBlock
-                                                        Grid.Column="1"
-                                                        VerticalAlignment="Center"
-                                                        Style="{DynamicResource SettingTitleLabel}"
-                                                        Text="{DynamicResource showOpenResultHotkey}" />
-                                                    <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
-                                                </StackPanel>
-                                                <CheckBox
-                                                    Grid.Column="2"
-                                                    FontSize="14"
-                                                    IsChecked="{Binding Settings.ShowOpenResultHotkey}"
-                                                    Style="{DynamicResource SideControlCheckBox}" />
-                                            </ItemsControl>
-                                        </Border>
-                                    </StackPanel>
-                                </Border>
+                                    <Border
+                                        Margin="0,12,0,0"
+                                        Padding="0"
+                                        CornerRadius="5"
+                                        Style="{DynamicResource SettingGroupBox}">
+                                        <StackPanel Orientation="Vertical">
+                                            <Border
+                                                Margin="0"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <StackPanel Style="{StaticResource TextPanel}">
+                                                        <TextBlock
+                                                            Grid.Column="1"
+                                                            VerticalAlignment="Center"
+                                                            Style="{DynamicResource SettingTitleLabel}"
+                                                            Text="{DynamicResource openResultModifiers}" />
+                                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource openResultModifiersToolTip}" />
+                                                    </StackPanel>
+                                                    <ComboBox
+                                                        Grid.Column="2"
+                                                        Width="120"
+                                                        Margin="0,0,18,0"
+                                                        FontSize="14"
+                                                        ItemsSource="{Binding OpenResultModifiersList}"
+                                                        SelectedItem="{Binding Settings.OpenResultModifiers}" />
+                                                </ItemsControl>
+                                            </Border>
 
-                                <TextBlock
-                                    Grid.Row="3"
-                                    Margin="0,0,12,2"
-                                    Padding="0,12,0,0"
-                                    VerticalAlignment="Center"
-                                    FontSize="14"
-                                    Foreground="{DynamicResource Color05B}"
-                                    Text="{DynamicResource customQueryHotkey}" />
-                                <ListView
-                                    Grid.Row="4"
-                                    Margin="0,0,0,0"
-                                    Background="{DynamicResource Color02B}"
-                                    BorderBrush="DarkGray"
-                                    BorderThickness="1"
-                                    ItemsSource="{Binding Settings.CustomPluginHotkeys}"
-                                    SelectedItem="{Binding SelectedCustomPluginHotkey}"
-                                    Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
-                                    <ListView.View>
-                                        <GridView>
-                                            <GridViewColumn Width="180" Header="{DynamicResource hotkey}">
-                                                <GridViewColumn.CellTemplate>
-                                                    <DataTemplate DataType="userSettings:CustomPluginHotkey">
-                                                        <TextBlock Text="{Binding Hotkey}" />
-                                                    </DataTemplate>
-                                                </GridViewColumn.CellTemplate>
-                                            </GridViewColumn>
-                                            <GridViewColumn Width="540" Header="{DynamicResource customQuery}">
-                                                <GridViewColumn.CellTemplate>
-                                                    <DataTemplate DataType="userSettings:CustomPluginHotkey">
-                                                        <TextBlock Text="{Binding ActionKeyword}" />
-                                                    </DataTemplate>
-                                                </GridViewColumn.CellTemplate>
-                                            </GridViewColumn>
-                                        </GridView>
-                                    </ListView.View>
-                                </ListView>
-                                <StackPanel
-                                    Grid.Row="5"
-                                    Margin="0"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Top"
-                                    Orientation="Horizontal">
-                                    <Button
-                                        MinWidth="100"
-                                        Margin="10"
-                                        Click="OnDeleteCustomHotkeyClick"
-                                        Content="{DynamicResource delete}" />
-                                    <Button
-                                        MinWidth="100"
-                                        Margin="10"
-                                        Click="OnnEditCustomHotkeyClick"
-                                        Content="{DynamicResource edit}" />
-                                    <Button
-                                        MinWidth="100"
-                                        Margin="10,10,0,10"
-                                        Click="OnAddCustomeHotkeyClick"
-                                        Content="{DynamicResource add}" />
+                                            <Separator
+                                                Width="Auto"
+                                                BorderThickness="1"
+                                                Style="{StaticResource SettingSeparatorStyle}" />
+                                            <Border
+                                                Margin="0"
+                                                Padding="0,14,0,14"
+                                                BorderThickness="0"
+                                                Style="{DynamicResource SettingGroupBox}">
+                                                <ItemsControl Style="{StaticResource SettingGrid}">
+                                                    <StackPanel Style="{StaticResource TextPanel}">
+                                                        <TextBlock
+                                                            Grid.Column="1"
+                                                            VerticalAlignment="Center"
+                                                            Style="{DynamicResource SettingTitleLabel}"
+                                                            Text="{DynamicResource showOpenResultHotkey}" />
+                                                        <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource showOpenResultHotkeyToolTip}" />
+                                                    </StackPanel>
+                                                    <CheckBox
+                                                        Grid.Column="2"
+                                                        FontSize="14"
+                                                        IsChecked="{Binding Settings.ShowOpenResultHotkey}"
+                                                        Style="{DynamicResource SideControlCheckBox}" />
+                                                </ItemsControl>
+                                            </Border>
+                                        </StackPanel>
+                                    </Border>
+
+                                    <TextBlock
+                                        Margin="0,8,12,2"
+                                        Padding="0,12,0,0"
+                                        VerticalAlignment="Center"
+                                        FontSize="14"
+                                        Foreground="{DynamicResource Color05B}"
+                                        Text="{DynamicResource customQueryHotkey}" />
+                                    <ListView
+                                        MinHeight="205"
+                                        Margin="0,6,0,0"
+                                        Background="{DynamicResource Color02B}"
+                                        BorderBrush="DarkGray"
+                                        BorderThickness="1"
+                                        ItemsSource="{Binding Settings.CustomPluginHotkeys}"
+                                        SelectedItem="{Binding SelectedCustomPluginHotkey}"
+                                        Style="{StaticResource {x:Static GridView.GridViewStyleKey}}">
+                                        <ListView.View>
+                                            <GridView>
+                                                <GridViewColumn Width="180" Header="{DynamicResource hotkey}">
+                                                    <GridViewColumn.CellTemplate>
+                                                        <DataTemplate DataType="userSettings:CustomPluginHotkey">
+                                                            <TextBlock Text="{Binding Hotkey}" />
+                                                        </DataTemplate>
+                                                    </GridViewColumn.CellTemplate>
+                                                </GridViewColumn>
+                                                <GridViewColumn Width="540" Header="{DynamicResource customQuery}">
+                                                    <GridViewColumn.CellTemplate>
+                                                        <DataTemplate DataType="userSettings:CustomPluginHotkey">
+                                                            <TextBlock Text="{Binding ActionKeyword}" />
+                                                        </DataTemplate>
+                                                    </GridViewColumn.CellTemplate>
+                                                </GridViewColumn>
+                                            </GridView>
+                                        </ListView.View>
+                                    </ListView>
+                                    <StackPanel
+                                        Margin="0"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Top"
+                                        Orientation="Horizontal">
+                                        <Button
+                                            MinWidth="100"
+                                            Margin="10"
+                                            Click="OnDeleteCustomHotkeyClick"
+                                            Content="{DynamicResource delete}" />
+                                        <Button
+                                            MinWidth="100"
+                                            Margin="10"
+                                            Click="OnnEditCustomHotkeyClick"
+                                            Content="{DynamicResource edit}" />
+                                        <Button
+                                            MinWidth="100"
+                                            Margin="10,10,0,10"
+                                            Click="OnAddCustomeHotkeyClick"
+                                            Content="{DynamicResource add}" />
+                                    </StackPanel>
                                 </StackPanel>
                             </Grid>
                         </Border>

From 05dbe94f53eae959487e79c55436261cb02f0ea3 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Fri, 24 Dec 2021 15:06:59 -0600
Subject: [PATCH 2/3] Use Global Hook for Hotkey Control

---
 .../Hotkey/GlobalHotkey.cs                    | 11 ++-
 .../Hotkey/HotkeyModel.cs                     |  6 +-
 .../Hotkey/InterceptKeys.cs                   |  3 +
 Flow.Launcher/HotkeyControl.xaml              |  1 -
 Flow.Launcher/HotkeyControl.xaml.cs           | 78 ++++++++++++++++---
 Flow.Launcher/SettingWindow.xaml.cs           |  2 +-
 6 files changed, 81 insertions(+), 20 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Hotkey/GlobalHotkey.cs b/Flow.Launcher.Infrastructure/Hotkey/GlobalHotkey.cs
index a091856969b..30a77f79969 100644
--- a/Flow.Launcher.Infrastructure/Hotkey/GlobalHotkey.cs
+++ b/Flow.Launcher.Infrastructure/Hotkey/GlobalHotkey.cs
@@ -12,9 +12,9 @@ namespace Flow.Launcher.Infrastructure.Hotkey
     public unsafe class GlobalHotkey : IDisposable
     {
         private static readonly IntPtr hookId;
-        
-        
-        
+
+
+
         public delegate bool KeyboardCallback(KeyEvent keyEvent, int vkCode, SpecialKeyState state);
         internal static Func<KeyEvent, int, SpecialKeyState, bool> hookedKeyboardCallback;
 
@@ -27,12 +27,15 @@ public unsafe class GlobalHotkey : IDisposable
         static GlobalHotkey()
         {
             // Set the hook
-            hookId = InterceptKeys.SetHook(& LowLevelKeyboardProc);
+            hookId = InterceptKeys.SetHook(&LowLevelKeyboardProc);
         }
 
         public static SpecialKeyState CheckModifiers()
         {
             SpecialKeyState state = new SpecialKeyState();
+
+           
+
             if ((InterceptKeys.GetKeyState(VK_SHIFT) & 0x8000) != 0)
             {
                 //SHIFT is pressed
diff --git a/Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs b/Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs
index 5bd97714c15..0a7737fb719 100644
--- a/Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs
+++ b/Flow.Launcher.Infrastructure/Hotkey/HotkeyModel.cs
@@ -31,15 +31,15 @@ public ModifierKeys ModifierKeys
                 }
                 if (Shift)
                 {
-                    modifierKeys = modifierKeys | ModifierKeys.Shift;
+                    modifierKeys |= ModifierKeys.Shift;
                 }
                 if (Win)
                 {
-                    modifierKeys = modifierKeys | ModifierKeys.Windows;
+                    modifierKeys |= ModifierKeys.Windows;
                 }
                 if (Ctrl)
                 {
-                    modifierKeys = modifierKeys | ModifierKeys.Control;
+                    modifierKeys |= ModifierKeys.Control;
                 }
                 return modifierKeys;
             }
diff --git a/Flow.Launcher.Infrastructure/Hotkey/InterceptKeys.cs b/Flow.Launcher.Infrastructure/Hotkey/InterceptKeys.cs
index d33bac34cea..737394bae4f 100644
--- a/Flow.Launcher.Infrastructure/Hotkey/InterceptKeys.cs
+++ b/Flow.Launcher.Infrastructure/Hotkey/InterceptKeys.cs
@@ -34,5 +34,8 @@ public static IntPtr SetHook(delegate* unmanaged<int, UIntPtr, IntPtr, IntPtr> p
 
         [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
         public static extern short GetKeyState(int keyCode);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true, CallingConvention = CallingConvention.Winapi)]
+        public static extern short GetAsyncKeyState(int keyCode);
     }
 }
\ No newline at end of file
diff --git a/Flow.Launcher/HotkeyControl.xaml b/Flow.Launcher/HotkeyControl.xaml
index 9b5f671d8f5..5bc6cbbc8dc 100644
--- a/Flow.Launcher/HotkeyControl.xaml
+++ b/Flow.Launcher/HotkeyControl.xaml
@@ -49,7 +49,6 @@
             Margin="0,0,18,0"
             VerticalContentAlignment="Center"
             input:InputMethod.IsInputMethodEnabled="False"
-            PreviewKeyDown="TbHotkey_OnPreviewKeyDown"
             TabIndex="100"
             LostFocus="tbHotkey_LostFocus"/>
     </Grid>
diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index bc437d8628b..5d1a258e771 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -9,6 +9,8 @@
 using Flow.Launcher.Infrastructure.Hotkey;
 using Flow.Launcher.Plugin;
 using System.Threading;
+using Flow.Launcher.Core.Plugin;
+using Flow.Launcher.Infrastructure.Logger;
 
 namespace Flow.Launcher
 {
@@ -25,41 +27,93 @@ public partial class HotkeyControl : UserControl
 
         protected virtual void OnHotkeyChanged() => HotkeyChanged?.Invoke(this, EventArgs.Empty);
 
+        private Func<int, int, SpecialKeyState, bool> callback { get; set; }
+
         public HotkeyControl()
         {
             InitializeComponent();
             tbMsgTextOriginal = tbMsg.Text;
             tbMsgForegroundColorOriginal = tbMsg.Foreground;
+
+            callback = TbHotkey_OnPreviewKeyDown;
+
+            GotFocus += (_, _) =>
+            {
+                PluginManager.API.RegisterGlobalKeyboardCallback(callback);
+            };
+            LostFocus += (_, _) =>
+            {
+                PluginManager.API.RemoveGlobalKeyboardCallback(callback);
+            };
         }
 
         private CancellationTokenSource hotkeyUpdateSource;
 
-        private void TbHotkey_OnPreviewKeyDown(object sender, KeyEventArgs e)
+        private SpecialKeyState state = new SpecialKeyState();
+
+        private bool TbHotkey_OnPreviewKeyDown(int keyevent, int vkcode, SpecialKeyState dummy)
         {
+            var key = KeyInterop.KeyFromVirtualKey(vkcode);
+
+            if ((KeyEvent)keyevent is not (KeyEvent.WM_KEYDOWN or KeyEvent.WM_SYSKEYDOWN))
+            {
+                switch (key)
+                {
+                    case Key.LeftAlt or Key.RightAlt:
+                        state.AltPressed = false;
+                        break;
+                    case Key.LeftCtrl or Key.RightCtrl:
+                        state.CtrlPressed = false;
+                        break;
+                    case Key.LeftShift or Key.RightShift:
+                        state.ShiftPressed = false;
+                        break;
+                    case Key.LWin or Key.LWin:
+                        state.WinPressed = false;
+                        break;
+                    default:
+                        break;
+                }
+                return true;
+            }
+
+            switch (key)
+            {
+                case Key.LeftAlt or Key.RightAlt:
+                    state.AltPressed = true;
+                    break;
+                case Key.LeftCtrl or Key.RightCtrl:
+                    state.CtrlPressed = true;
+                    break;
+                case Key.LeftShift or Key.RightShift:
+                    state.ShiftPressed = true;
+                    break;
+                case Key.LWin or Key.LWin:
+                    state.WinPressed = true;
+                    break;
+            }
+
+
             hotkeyUpdateSource?.Cancel();
             hotkeyUpdateSource?.Dispose();
             hotkeyUpdateSource = new();
             var token = hotkeyUpdateSource.Token;
-            e.Handled = true;
 
-            //when alt is pressed, the real key should be e.SystemKey
-            Key key = e.Key == Key.System ? e.SystemKey : e.Key;
-
-            SpecialKeyState specialKeyState = GlobalHotkey.CheckModifiers();
 
             var hotkeyModel = new HotkeyModel(
-                specialKeyState.AltPressed,
-                specialKeyState.ShiftPressed,
-                specialKeyState.WinPressed,
-                specialKeyState.CtrlPressed,
+                state.AltPressed,
+                state.ShiftPressed,
+                state.WinPressed,
+                state.CtrlPressed,
                 key);
 
             var hotkeyString = hotkeyModel.ToString();
 
             if (hotkeyString == tbHotkey.Text)
             {
-                return;
+                return false;
             }
+            Log.Debug("test hotkey" + hotkeyString);
 
             _ = Dispatcher.InvokeAsync(async () =>
             {
@@ -67,6 +121,8 @@ private void TbHotkey_OnPreviewKeyDown(object sender, KeyEventArgs e)
                 if (!token.IsCancellationRequested)
                     await SetHotkey(hotkeyModel);
             });
+
+            return false;
         }
 
         public async Task SetHotkey(HotkeyModel keyModel, bool triggerValidate = true)
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 338b9640615..e9d8fb35c6e 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -137,7 +137,7 @@ private void OnHotkeyControlLoaded(object sender, RoutedEventArgs e)
 
         private void OnHotkeyControlFocused(object sender, RoutedEventArgs e)
         {
-            HotKeyMapper.RemoveHotkey(settings.Hotkey);
+            //HotKeyMapper.RemoveHotkey(settings.Hotkey);
         }
 
         private void OnHotkeyControlFocusLost(object sender, RoutedEventArgs e)

From 0f5523653a6c633a44130367c18ae94591b25524 Mon Sep 17 00:00:00 2001
From: Hongtao Zhang <hongtao_zhang@outlook.com>
Date: Fri, 24 Dec 2021 15:18:54 -0600
Subject: [PATCH 3/3] Reset KeyState when loss focus

---
 Flow.Launcher/HotkeyControl.xaml.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index 5d1a258e771..86c54293d7a 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -44,12 +44,16 @@ public HotkeyControl()
             LostFocus += (_, _) =>
             {
                 PluginManager.API.RemoveGlobalKeyboardCallback(callback);
+                state.AltPressed = false;
+                state.CtrlPressed = false;
+                state.ShiftPressed = false;
+                state.WinPressed = false;
             };
         }
 
         private CancellationTokenSource hotkeyUpdateSource;
 
-        private SpecialKeyState state = new SpecialKeyState();
+        private SpecialKeyState state = new();
 
         private bool TbHotkey_OnPreviewKeyDown(int keyevent, int vkcode, SpecialKeyState dummy)
         {