mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Win32 modifier keys handling

Browse Source
This commit is contained in:
hobby8 2018-01-26 17:49:26 +02:00 committed by Lukas Dürrenberger
parent d6c6345d4c
commit 1062e95e39
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/SFML/Window/Win32/WindowImplWin32.cpp
View File

@ -173,7 +173,7 @@ m_lastSize (mode.width, mode.height),
m_resizing (false), m_resizing (false),
m_surrogate (0), m_surrogate (0),
m_mouseInside (false), m_mouseInside (false),
m_fullscreen (style & Style::Fullscreen), m_fullscreen ((style & Style::Fullscreen) != 0),
m_cursorGrabbed (m_fullscreen) m_cursorGrabbed (m_fullscreen)
{ {
// Set that this process is DPI aware and can handle DPI scaling // Set that this process is DPI aware and can handle DPI scaling
@ -728,10 +728,10 @@ void WindowImplWin32::processEvent(UINT message, WPARAM wParam, LPARAM lParam)
{ {
Event event; Event event;
event.type = Event::KeyPressed; event.type = Event::KeyPressed;
event.key.alt = HIWORD(GetAsyncKeyState(VK_MENU)) != 0; event.key.alt = HIWORD(GetKeyState(VK_MENU)) != 0;
event.key.control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0; event.key.control = HIWORD(GetKeyState(VK_CONTROL)) != 0;
event.key.shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0; event.key.shift = HIWORD(GetKeyState(VK_SHIFT)) != 0;
event.key.system = HIWORD(GetAsyncKeyState(VK_LWIN)) || HIWORD(GetAsyncKeyState(VK_RWIN)); event.key.system = HIWORD(GetKeyState(VK_LWIN)) || HIWORD(GetKeyState(VK_RWIN));
event.key.code = virtualKeyCodeToSF(wParam, lParam); event.key.code = virtualKeyCodeToSF(wParam, lParam);
pushEvent(event); pushEvent(event);
} }
@ -744,10 +744,10 @@ void WindowImplWin32::processEvent(UINT message, WPARAM wParam, LPARAM lParam)
{ {
Event event; Event event;
event.type = Event::KeyReleased; event.type = Event::KeyReleased;
event.key.alt = HIWORD(GetAsyncKeyState(VK_MENU)) != 0; event.key.alt = HIWORD(GetKeyState(VK_MENU)) != 0;
event.key.control = HIWORD(GetAsyncKeyState(VK_CONTROL)) != 0; event.key.control = HIWORD(GetKeyState(VK_CONTROL)) != 0;
event.key.shift = HIWORD(GetAsyncKeyState(VK_SHIFT)) != 0; event.key.shift = HIWORD(GetKeyState(VK_SHIFT)) != 0;
event.key.system = HIWORD(GetAsyncKeyState(VK_LWIN)) || HIWORD(GetAsyncKeyState(VK_RWIN)); event.key.system = HIWORD(GetKeyState(VK_LWIN)) || HIWORD(GetKeyState(VK_RWIN));
event.key.code = virtualKeyCodeToSF(wParam, lParam); event.key.code = virtualKeyCodeToSF(wParam, lParam);
pushEvent(event); pushEvent(event);
break; break;