Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-26 12:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed X-axis scroll offset inversion (take two).

Browse Source 
Fixed #239 (properly).
This commit is contained in:
Camilla Berglund 2014-10-26 13:53:45 +01:00
parent b4c4ba0439
commit 4c64e94d39
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -106,8 +106,6 @@ GLFW bundles a number of dependencies in the `deps/` directory.
bit field was unchanged bit field was unchanged
- [Cocoa] Bugfix: Joystick enumeration took hundreds of ms on some systems - [Cocoa] Bugfix: Joystick enumeration took hundreds of ms on some systems
- [Cocoa] Bugfix: The cursor was hidden when the user resized a GLFW window - [Cocoa] Bugfix: The cursor was hidden when the user resized a GLFW window
- [Cocoa] Bugfix: The X-axis scroll offsets were inverted relative to the
Windows and X11 ports
- [Win32] Enabled generation of pkg-config file for MinGW - [Win32] Enabled generation of pkg-config file for MinGW
- [Win32] Removed option to require explicitly linking against `winmm.dll` - [Win32] Removed option to require explicitly linking against `winmm.dll`
- [Win32] Bugfix: Failure to load winmm or its functions was not reported to - [Win32] Bugfix: Failure to load winmm or its functions was not reported to
@ -122,6 +120,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
specified monitor specified monitor
- [Win32] Bugfix: The wrong incorrect physical size was returned for - [Win32] Bugfix: The wrong incorrect physical size was returned for
non-primary monitors non-primary monitors
- [Win32] Bugfix: X-axis scroll offsets were inverted
- [X11] Added run-time support for systems lacking the XKB extension - [X11] Added run-time support for systems lacking the XKB extension
- [X11] Made GLX 1.3 the minimum supported version - [X11] Made GLX 1.3 the minimum supported version
- [X11] Replaced `XRRGetScreenResources` with `XRRGetScreenResourcesCurrent` - [X11] Replaced `XRRGetScreenResources` with `XRRGetScreenResourcesCurrent`
@ -140,6 +139,7 @@ GLFW bundles a number of dependencies in the `deps/` directory.
- [X11] Bugfix: The name pointer of joysticks were not cleared on disconnection - [X11] Bugfix: The name pointer of joysticks were not cleared on disconnection
- [X11] Bugfix: Video mode dimensions were not rotated to match the CRTC - [X11] Bugfix: Video mode dimensions were not rotated to match the CRTC
- [X11] Bugfix: Unicode character input ignored dead keys - [X11] Bugfix: Unicode character input ignored dead keys
- [X11] Bugfix: X-axis scroll offsets were inverted
## Contact ## Contact

2
src/cocoa_window.m
View File

@ -687,7 +687,7 @@ static int translateKey(unsigned int key)
// NOTE: The X-axis is inverted for consistency with Windows and X11. // NOTE: The X-axis is inverted for consistency with Windows and X11.
// Natural scrolling inverts both axes, making it consistent with // Natural scrolling inverts both axes, making it consistent with
// the similarly named feature on modern X11 desktop systems. // the similarly named feature on modern X11 desktop systems.
_glfwInputScroll(window, -deltaX, deltaY); _glfwInputScroll(window, deltaX, deltaY);
} }
} }

2
src/win32_window.c
View File

@ -728,7 +728,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL:
{ {
// This message is only sent on Windows Vista and later // This message is only sent on Windows Vista and later
_glfwInputScroll(window, (SHORT) HIWORD(wParam) / (double) WHEEL_DELTA, 0.0); _glfwInputScroll(window, -((SHORT) HIWORD(wParam) / (double) WHEEL_DELTA), 0.0);
return 0; return 0;
} }

4
src/x11_window.c
View File

@ -949,9 +949,9 @@ static void processEvent(XEvent *event)
else if (event->xbutton.button == Button5) else if (event->xbutton.button == Button5)
_glfwInputScroll(window, 0.0, -1.0); _glfwInputScroll(window, 0.0, -1.0);
else if (event->xbutton.button == Button6) else if (event->xbutton.button == Button6)
_glfwInputScroll(window, -1.0, 0.0);
else if (event->xbutton.button == Button7)
_glfwInputScroll(window, 1.0, 0.0); _glfwInputScroll(window, 1.0, 0.0);
else if (event->xbutton.button == Button7)
_glfwInputScroll(window, -1.0, 0.0);
else else
{ {