From a7ca0921df33736b8e73023c2ee8ca2d7ce08a09 Mon Sep 17 00:00:00 2001 From: Malcolm Still Date: Fri, 6 Jan 2017 15:31:58 +0000 Subject: [PATCH] Use new axis querying functions to update mouse scroll state. --- src/OpenTK/Platform/Linux/LinuxInput.cs | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/src/OpenTK/Platform/Linux/LinuxInput.cs b/src/OpenTK/Platform/Linux/LinuxInput.cs index 5e42712b..efa45c70 100644 --- a/src/OpenTK/Platform/Linux/LinuxInput.cs +++ b/src/OpenTK/Platform/Linux/LinuxInput.cs @@ -485,21 +485,15 @@ namespace OpenTK.Platform.Linux { mouse.State.SetIsConnected(true); - double value = e.AxisValue; - PointerAxis axis = e.Axis; - switch (axis) + if (e.HasAxis(PointerAxis.HorizontalScroll)) { - case PointerAxis.HorizontalScroll: - mouse.State.SetScrollRelative((float)value, 0); - break; - case PointerAxis.VerticalScroll: - mouse.State.SetScrollRelative(0, (float)value); - break; - - default: - Debug.Print("[Input] Unknown scroll axis {0}.", axis); - break; + mouse.State.SetScrollRelative((float)e.AxisValue(PointerAxis.HorizontalScroll), 0); + } + if (e.HasAxis(PointerAxis.VerticalScroll)) + { + Debug.Print(e.AxisValue(PointerAxis.VerticalScroll)); + mouse.State.SetScrollRelative(0, (float)e.AxisValue(PointerAxis.VerticalScroll)); } } }