From 3b9a14fc9c3845afc7b8788a62435bdc02a7daaf Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 26 Oct 2014 18:29:34 +0100 Subject: [PATCH] Moved note to new place of inversion. --- src/cocoa_window.m | 5 ----- src/win32_window.c | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 3fec6db0..a804d6dd 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -683,12 +683,7 @@ static int translateKey(unsigned int key) } if (fabs(deltaX) > 0.0 || fabs(deltaY) > 0.0) - { - // NOTE: The X-axis is inverted for consistency with Windows and X11. - // Natural scrolling inverts both axes, making it consistent with - // the similarly named feature on modern X11 desktop systems. _glfwInputScroll(window, deltaX, deltaY); - } } - (void)resetCursorRects diff --git a/src/win32_window.c b/src/win32_window.c index a15c38c8..f7c531dd 100644 --- a/src/win32_window.c +++ b/src/win32_window.c @@ -728,6 +728,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg, case WM_MOUSEHWHEEL: { // This message is only sent on Windows Vista and later + // NOTE: The X-axis is inverted for consistency with OS X and X11. _glfwInputScroll(window, -((SHORT) HIWORD(wParam) / (double) WHEEL_DELTA), 0.0); return 0; }