diff options
| author | Euclid Linden <euclid@lindenlab.com> | 2022-03-29 17:43:50 +0000 |
|---|---|---|
| committer | Euclid Linden <euclid@lindenlab.com> | 2022-03-29 17:43:50 +0000 |
| commit | 977bd76316776e57abf6537ba811499d45677a58 (patch) | |
| tree | 2a869c0382b735ce50f363b9d622a4d6f557df24 /indra | |
| parent | 283e86eda5d3fc412b95d8e518e13a9ecf3e3d33 (diff) | |
| parent | e76a3b12e6fd463856074632fbd1e7e5d3267f2d (diff) | |
Merged in euclid-17074 (pull request #925)
SL-17074 Redo ALT-F4 handling fix
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 9feccd7874..26e624c6ec 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2426,7 +2426,7 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_SYSKEYDOWN"); // allow system keys, such as ALT-F4 to be processed by Windows eat_keystroke = FALSE; - break; + // intentional fall-through here } case WM_KEYDOWN: { @@ -2451,10 +2451,12 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ gKeyboard->handleKeyDown(w_param, mask); } }); - return eat_keystroke; + if (eat_keystroke) return 0; // skip DefWindowProc() handling if we're consuming the keypress + break; } case WM_SYSKEYUP: eat_keystroke = FALSE; + // intentional fall-through here case WM_KEYUP: { LL_PROFILE_ZONE_NAMED_CATEGORY_WIN32("mwp - WM_KEYUP"); @@ -2478,7 +2480,8 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ gKeyboard->handleKeyUp(w_param, mask); } }); - return eat_keystroke; + if (eat_keystroke) return 0; // skip DefWindowProc() handling if we're consuming the keypress + break; } case WM_IME_SETCONTEXT: { |