From 83a0b4f4310e1935675a7868fc511d1643bfbef2 Mon Sep 17 00:00:00 2001 From: Dylan Wilson Date: Mon, 24 Aug 2015 23:22:25 +1000 Subject: [PATCH] removing nullable scroll wheel values as they have no purpose now --- Source/MonoGame.Extended/InputListeners/MouseEventArgs.cs | 6 +++--- Source/Sandbox/SandboxGame.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/MonoGame.Extended/InputListeners/MouseEventArgs.cs b/Source/MonoGame.Extended/InputListeners/MouseEventArgs.cs index aff24607..90595518 100644 --- a/Source/MonoGame.Extended/InputListeners/MouseEventArgs.cs +++ b/Source/MonoGame.Extended/InputListeners/MouseEventArgs.cs @@ -23,9 +23,9 @@ namespace MonoGame.Extended.InputListeners public MouseState PreviousState { get; private set; } public MouseState CurrentState { get; private set; } - public MouseButton Button { get; private set; } - public int? ScrollWheelValue { get; private set; } - public int? ScrollWheelDelta { get; private set; } public Point Position { get; private set; } + public MouseButton Button { get; private set; } + public int ScrollWheelValue { get; private set; } + public int ScrollWheelDelta { get; private set; } } } diff --git a/Source/Sandbox/SandboxGame.cs b/Source/Sandbox/SandboxGame.cs index c6603bb6..b28b7eee 100644 --- a/Source/Sandbox/SandboxGame.cs +++ b/Source/Sandbox/SandboxGame.cs @@ -212,7 +212,7 @@ namespace Sandbox // zoom mouseListener.MouseWheelMoved += (sender, args) => { - _camera.Zoom += args.ScrollWheelDelta.Value * 0.0001f; + _camera.Zoom += args.ScrollWheelDelta * 0.001f; }; // look at @@ -229,7 +229,7 @@ namespace Sandbox mouseListener.MouseUp += (sender, args) => Trace.WriteLine("MouseUp"); mouseListener.MouseClicked += (sender, args) => Trace.WriteLine("MouseClicked"); mouseListener.MouseDoubleClicked += (sender, args) => Trace.WriteLine("MouseDoubleClicked"); - mouseListener.MouseWheelMoved += (sender, args) => Trace.WriteLine("MouseWheelMoved"); + mouseListener.MouseWheelMoved += (sender, args) => Trace.WriteLine(string.Format("MouseWheelMoved {0}", args.ScrollWheelValue)); mouseListener.MouseDragged += (sender, args) => Trace.WriteLine("MouseDragged"); } }