diff options
Diffstat (limited to 'tools/viewer/sk_app/win/Window_win.cpp')
| -rw-r--r-- | tools/viewer/sk_app/win/Window_win.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/viewer/sk_app/win/Window_win.cpp b/tools/viewer/sk_app/win/Window_win.cpp index 5b73b44761..10db0ec675 100644 --- a/tools/viewer/sk_app/win/Window_win.cpp +++ b/tools/viewer/sk_app/win/Window_win.cpp @@ -101,7 +101,7 @@ bool Window_win::init(HINSTANCE hInstance) { // Set the position of the window to the top left corner. posX = posY = 0; - } + } */ // gIsFullscreen = fullscreen; @@ -235,19 +235,19 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; case WM_UNICHAR: - eventHandled = window->onChar((SkUnichar)wParam, + eventHandled = window->onChar((SkUnichar)wParam, get_modifiers(message, wParam, lParam)); break; case WM_CHAR: { const uint16_t* c = reinterpret_cast<uint16_t*>(&wParam); - eventHandled = window->onChar(SkUTF16_NextUnichar(&c), + eventHandled = window->onChar(SkUTF16_NextUnichar(&c), get_modifiers(message, wParam, lParam)); } break; case WM_KEYDOWN: case WM_SYSKEYDOWN: - eventHandled = window->onKey(get_key(wParam), Window::kDown_InputState, + eventHandled = window->onKey(get_key(wParam), Window::kDown_InputState, get_modifiers(message, wParam, lParam)); break; @@ -273,7 +273,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) Window::InputState istate = ((wParam & MK_LBUTTON) != 0) ? Window::kDown_InputState : Window::kUp_InputState; - eventHandled = window->onMouse(xPos, yPos, istate, + eventHandled = window->onMouse(xPos, yPos, istate, get_modifiers(message, wParam, lParam)); } break; |