Prevent shortcuts from auto repeating when keeping the keys pressed down

microsoft · Jun 8, 2020 · bf89bbe · bf89bbe
1 parent f8f676e
commit bf89bbe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/common/interop/HotkeyManager.cpp b/src/common/interop/HotkeyManager.cpp
@@ -44,12 +44,17 @@ bool HotkeyManager::IsActiveProc()
 // KeyboardEvent callback is only fired for relevant key events.
 bool HotkeyManager::FilterKeyboardProc(KeyboardEvent^ ev)
 {
+    auto oldHandle = GetHotkeyHandle(pressedKeys);
+
     // Updating the pressed keys here so we know if the keypress event 
     // should be propagated or not.
     UpdatePressedKeys(ev);
 
     auto pressedKeysHandle = GetHotkeyHandle(pressedKeys);
-    if (hotkeys->ContainsKey(pressedKeysHandle))
+
+    // Check if the hotkey matches the pressed keys, and check if the pressed keys aren't duplicate
+    // (there shouldn't be auto repeating hotkeys)
+    if (hotkeys->ContainsKey(pressedKeysHandle) && oldHandle != pressedKeysHandle)
     {
         return true;
     }

diff --git a/src/common/interop/KeyboardHook.cpp b/src/common/interop/KeyboardHook.cpp
@@ -64,7 +64,7 @@ void KeyboardHook::Start()
     hookHandle = SetWindowsHookEx(
         WH_KEYBOARD_LL, 
         (HOOKPROC)(void*)Marshal::GetFunctionPointerForDelegate(hookProc), 
-        GetModuleHandle(msclr::interop::marshal_as<std::wstring>(curModule->ModuleName).c_str()),
+        0,
         0);
     if (hookHandle == nullptr)
     {

diff --git a/src/modules/launcher/Wox/ViewModel/MainViewModel.cs b/src/modules/launcher/Wox/ViewModel/MainViewModel.cs
@@ -587,7 +587,7 @@ private void SetCustomPluginHotkey()
 
         private void OnHotkey()
         {
-            App.Current.Dispatcher.Invoke(() =>
+            Application.Current.Dispatcher.Invoke(() =>
             {
                 if (!ShouldIgnoreHotkeys())
                 {