Set _ignoreWmChar when IME sends a ImeProcessed key to prevent input …

…via WM_CHAR (#12942)
AvaloniaUI · Oct 2, 2023 · 1b856c8 · 1b856c8
1 parent 2d45ed8
commit 1b856c8
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs b/src/Windows/Avalonia.Win32/WindowImpl.AppWndProc.cs
@@ -775,12 +775,19 @@ protected virtual unsafe IntPtr AppWndProc(IntPtr hWnd, uint msg, IntPtr wParam,
 
                 if (message == WindowsMessage.WM_KEYDOWN)
                 {
-                    // Handling a WM_KEYDOWN message should cause the subsequent WM_CHAR message to
-                    // be ignored. This should be safe to do as WM_CHAR should only be produced in
-                    // response to the call to TranslateMessage/DispatchMessage after a WM_KEYDOWN
-                    // is handled.
-                    _ignoreWmChar = e.Handled;
-                }
+                    if(e is RawKeyEventArgs args && args.Key == Key.ImeProcessed)
+                    {
+                        _ignoreWmChar = true;
+                    }
+                    else
+                    {
+                        // Handling a WM_KEYDOWN message should cause the subsequent WM_CHAR message to
+                        // be ignored. This should be safe to do as WM_CHAR should only be produced in
+                        // response to the call to TranslateMessage/DispatchMessage after a WM_KEYDOWN
+                        // is handled.
+                        _ignoreWmChar = e.Handled;
+                    }
+                 }
 
                 if (s_intermediatePointsPooledList.Count > 0)
                 {