diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2020-08-05 16:59:04 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2020-08-05 16:59:04 +0300 |
| commit | 2ca006f6c179b77ad954d883d0a92d05011640f4 (patch) | |
| tree | dbbc45bacfdcb099ea8a168cd5a078b0a09e3c8d /intern/ghost | |
| parent | 43d41675a4e5f2621285c9eeac6737c83bf44923 (diff) | |
| parent | 87062d4d670c01c9c0835057aaf4164aea971e00 (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 849aa5a96f5..db26bd6a614 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -1144,9 +1144,13 @@ GHOST_EventKey *GHOST_SystemWin32::processKeyEvent(GHOST_WindowWin32 *window, RA int r; GetKeyboardState((PBYTE)state); + /* No text with control key pressed. */ + if (state[VK_CONTROL] & 0x80) { + utf8_char[0] = '\0'; + } // Don't call ToUnicodeEx on dead keys as it clears the buffer and so won't allow diacritical // composition. - if (MapVirtualKeyW(vk, 2) != 0) { + else if (MapVirtualKeyW(vk, 2) != 0) { // todo: ToUnicodeEx can respond with up to 4 utf16 chars (only 2 here). // Could be up to 24 utf8 bytes. if ((r = ToUnicodeEx( |