From ffa3df29ebd902939f262ab2ad0116354dd4990c Mon Sep 17 00:00:00 2001 From: thefiddler Date: Sun, 10 Aug 2014 02:56:37 +0200 Subject: [PATCH] [X11] Fixed core X11 scrolling and absolute y motions --- Source/OpenTK/Platform/X11/XI2MouseKeyboard.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/OpenTK/Platform/X11/XI2MouseKeyboard.cs b/Source/OpenTK/Platform/X11/XI2MouseKeyboard.cs index e308f39..00e90fc 100644 --- a/Source/OpenTK/Platform/X11/XI2MouseKeyboard.cs +++ b/Source/OpenTK/Platform/X11/XI2MouseKeyboard.cs @@ -490,6 +490,8 @@ namespace OpenTK.Platform.X11 float dx, dy; MouseButton button = X11KeyMap.TranslateButton(raw.detail, out dx, out dy); mouse.State[button] = raw.evtype == XIEventType.RawButtonPress; + if (mouse.ScrollX.number == -1 && mouse.ScrollY.number == -1) + mouse.State.SetScrollRelative(dx, dy); } break; @@ -554,7 +556,7 @@ namespace OpenTK.Platform.X11 d.State.X += (int)Math.Round(x); else d.State.X = (int)Math.Round(x); - if (d.MotionY.mode == XIMode.Absolute) + if (d.MotionY.mode == XIMode.Relative) d.State.Y += (int)Math.Round(y); else d.State.Y = (int)Math.Round(y); -- 2.7.4