diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-06-19 23:47:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-19 23:47:49 +0200 |
| commit | 3e0708094276fdb80a6b6929070fecf6fe5858bc (patch) | |
| tree | ba6cb93ff82869733fc914f9f8349568a43f90af | |
| parent | 8f5fbaefd1c627550d0722339e3a2400a8f4cf38 (diff) | |
| parent | d191a8b9f806641ba5ebdbfe059068dd15056124 (diff) | |
Merge pull request #39427 from hcmlax/shortcut_issue_39351
fixed issue where shortcut doesn't work if alt is pressed before shift
| -rw-r--r-- | platform/windows/display_server_windows.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 0b7130db74..7cb6e90edb 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -2565,9 +2565,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA case WM_KEYUP: case WM_KEYDOWN: { if (wParam == VK_SHIFT) - shift_mem = uMsg == WM_KEYDOWN; + shift_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN); if (wParam == VK_CONTROL) - control_mem = uMsg == WM_KEYDOWN; + control_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN); if (wParam == VK_MENU) { alt_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN); if (lParam & (1 << 24)) |