fix on-screen keyboard activation

microsoft · Feb 22, 2025 · 7fece23 · 7fece23
1 parent 74214f6
commit 7fece23
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.cpp b/src/modules/poweraccent/PowerAccentKeyboardService/KeyboardListener.cpp
@@ -169,6 +169,14 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
 
         if (std::find(letters.begin(), letters.end(), letterKey) != cend(letters) && m_isLanguageLetterCb(letterKey))
         {
+            if (m_toolbarVisible && letterPressed == letterKey)
+            {
+                // On-screen keyboard continuously sends WM_KEYDOWN when a key is held down
+                // If Quick Accent is visible, prevent the letter key from being processed
+                // https://github.com/microsoft/PowerToys/issues/36853
+                return true;
+            }
+
             m_stopwatch.reset();
             letterPressed = letterKey;
         }
@@ -220,7 +228,7 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
                 Logger::debug(L"Next toolbar position - space");
                 m_nextCharCb(TriggerKey::Space, m_leftShiftPressed || m_rightShiftPressed);
             }
-
+            
             return true;
         }
 
@@ -282,14 +290,14 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
 
     LRESULT KeyboardListener::LowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
     {
+        if (nCode == HC_ACTION && s_instance != nullptr)
         {
-            if (nCode == HC_ACTION && s_instance != nullptr)
+            KBDLLHOOKSTRUCT* key = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
+            switch (wParam)
             {
-                KBDLLHOOKSTRUCT* key = reinterpret_cast<KBDLLHOOKSTRUCT*>(lParam);
-                switch (wParam)
-                {
                 case WM_KEYDOWN:
                 {
+                    Logger::debug(L"Key down: {}", key->vkCode);
                     if (s_instance->OnKeyDown(*key))
                     {
                         return true;
@@ -304,10 +312,9 @@ namespace winrt::PowerToys::PowerAccentKeyboardService::implementation
                     }
                 }
                 break;
-                }
             }
-
-            return CallNextHookEx(NULL, nCode, wParam, lParam);
         }
+
+        return CallNextHookEx(NULL, nCode, wParam, lParam);
     }
 }