From e76a3b12e6fd463856074632fbd1e7e5d3267f2d Mon Sep 17 00:00:00 2001
From: Dave Houlton <euclid@lindenlab.com>
Date: Tue, 29 Mar 2022 11:36:28 -0600
Subject: [PATCH] SL-17074 fix ALT-F4 handling without impacting alt-zoom
---
indra/llwindow/llwindowwin32.cpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 9feccd78745..26e624c6ec4 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:
{
--
GitLab