Unverified Commit 3e070809 by Rémi Verschelde Committed by GitHub

Merge pull request #39427 from hcmlax/shortcut_issue_39351

fixed issue where shortcut doesn't work if alt is pressed before shift
parents 8f5fbaef d191a8b9
...@@ -2565,9 +2565,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA ...@@ -2565,9 +2565,9 @@ LRESULT DisplayServerWindows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
case WM_KEYUP: case WM_KEYUP:
case WM_KEYDOWN: { case WM_KEYDOWN: {
if (wParam == VK_SHIFT) if (wParam == VK_SHIFT)
shift_mem = uMsg == WM_KEYDOWN; shift_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN);
if (wParam == VK_CONTROL) if (wParam == VK_CONTROL)
control_mem = uMsg == WM_KEYDOWN; control_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN);
if (wParam == VK_MENU) { if (wParam == VK_MENU) {
alt_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN); alt_mem = (uMsg == WM_KEYDOWN || uMsg == WM_SYSKEYDOWN);
if (lParam & (1 << 24)) if (lParam & (1 << 24))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment