Merge pull request #39427 from hcmlax/shortcut_issue_39351

fixed issue where shortcut doesn't work if alt is pressed before shift
This commit is contained in:
Rémi Verschelde 2020-06-19 23:47:49 +02:00 committed by GitHub
commit 3e07080942
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -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))