From 3e9c39865200ba8d1d0ca5aeb8788b3b0e6c4ae2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 21 Nov 2016 21:35:53 +0900 Subject: [PATCH 1/2] Update input handler logic to match framework changes. --- osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs | 2 +- osu.Game/Screens/Play/Player.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs index bcd1d9f8db..4cba437883 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeMeter.cs @@ -75,7 +75,7 @@ namespace osu.Game.Graphics.UserInterface.Volume protected override bool OnWheel(InputState state) { - Volume += 0.05f * state.Mouse.WheelDiff; + Volume += 0.05f * state.Mouse.WheelDelta; return true; } diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 90abf55421..14df8d37b4 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -125,9 +125,9 @@ namespace osu.Game.Screens.Play { } - protected override void UpdateMouseState(InputState state) + protected override void TransformState(InputState state) { - base.UpdateMouseState(state); + base.TransformState(state); MouseState mouse = (MouseState)state.Mouse; From b0dfcf5429b48caee482a308abc9a15d3d0441a2 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 22 Nov 2016 12:26:18 +0900 Subject: [PATCH 2/2] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 9ed3a191bf..1d43e1ed56 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 9ed3a191bf76ead6ff34ac468898a0119b8e5454 +Subproject commit 1d43e1ed56421fbbefdf6c23dab8deeeaa0f592a