We don't need to pull scancode state to see if ALT is held down
This commit is contained in:
@@ -1239,12 +1239,11 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
|
|||||||
SDL_bool virtual_key = SDL_FALSE;
|
SDL_bool virtual_key = SDL_FALSE;
|
||||||
Uint16 rawcode = 0;
|
Uint16 rawcode = 0;
|
||||||
SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam, &rawcode, &virtual_key);
|
SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam, &rawcode, &virtual_key);
|
||||||
const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
|
|
||||||
|
|
||||||
/* Detect relevant keyboard shortcuts */
|
/* Detect relevant keyboard shortcuts */
|
||||||
if (keyboardState[SDL_SCANCODE_LALT] == SDL_PRESSED || keyboardState[SDL_SCANCODE_RALT] == SDL_PRESSED) {
|
if (code == SDL_SCANCODE_F4 && (SDL_GetModState() & SDL_KMOD_ALT)) {
|
||||||
/* ALT+F4: Close window */
|
/* ALT+F4: Close window */
|
||||||
if (code == SDL_SCANCODE_F4 && ShouldGenerateWindowCloseOnAltF4()) {
|
if (ShouldGenerateWindowCloseOnAltF4()) {
|
||||||
SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_CLOSE_REQUESTED, 0, 0);
|
SDL_SendWindowEvent(data->window, SDL_EVENT_WINDOW_CLOSE_REQUESTED, 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user