Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into clipboard

Browse Source 
Conflicts:
	src/CMakeLists.txt
This commit is contained in:
Camilla Berglund
2012-03-29 13:29:28 +02:00
parent e4328af790 171db6d6cb
commit 92d4c02e07
12 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/x11_window.c
+4 -4
View File
@@ -1144,14 +1144,14 @@ static void processSingleEvent(void)
// XFree86 3.3.2 and later translates mouse wheel up/down into
// mouse button 4 & 5 presses
else if (event.xbutton.button == Button4)
_glfwInputScroll(window, 0, 1);
_glfwInputScroll(window, 0.0, 1.0);
else if (event.xbutton.button == Button5)
_glfwInputScroll(window, 0, -1);
_glfwInputScroll(window, 0.0, -1.0);
else if (event.xbutton.button == Button6)
_glfwInputScroll(window, -1, 0);
_glfwInputScroll(window, -1.0, 0.0);
else if (event.xbutton.button == Button7)
_glfwInputScroll(window, 1, 0);
_glfwInputScroll(window, 1.0, 0.0);
break;
}