From a48c26d9993696fda11d624d5508dd8f06955530 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Nov 2018 19:40:44 +0900
Subject: [PATCH 1/3] Fix precision scroll events being handled incorrectly by
 editor

---
 osu.Game/Screens/Edit/Editor.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 0be15de7f4..b355d1f349 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System;
 using osuTK.Graphics;
 using osu.Framework.Screens;
 using osu.Game.Screens.Backgrounds;
@@ -181,12 +182,20 @@ namespace osu.Game.Screens.Edit
             LoadComponentAsync(currentScreen, screenContainer.Add);
         }
 
+        private double scrollAccumulation;
+
         protected override bool OnScroll(ScrollEvent e)
         {
-            if (e.ScrollDelta.X + e.ScrollDelta.Y > 0)
+            scrollAccumulation += e.ScrollDelta.X + e.ScrollDelta.Y * (e.IsPrecise ? 0.1 : 1);
+            if (Math.Abs(scrollAccumulation) < 1)
+                return true;
+
+            if (scrollAccumulation > 0)
                 clock.SeekBackward(!clock.IsRunning);
             else
                 clock.SeekForward(!clock.IsRunning);
+
+            scrollAccumulation = 0;
             return true;
         }
 

From 10047e6815c8a72cab9c76498dc96e8f8635296b Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 22 Nov 2018 20:13:40 +0900
Subject: [PATCH 2/3] Adjust tick-based wheel control to be more correct

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 16 ++++++++++------
 osu.Game/Screens/Edit/Editor.cs         | 18 +++++++++++-------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index c249651f98..c67ed5b845 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -228,15 +228,19 @@ namespace osu.Game.Overlays.Volume
         public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
 
         // because volume precision is set to 0.01, this local is required to keep track of more precise adjustments and only apply when possible.
-        private double adjustAccumulator;
+        private double scrollAccumulation;
 
         private void adjust(double delta, bool isPrecise)
         {
-            adjustAccumulator += delta * adjust_step * (isPrecise ? 0.1 : 1);
-            if (Math.Abs(adjustAccumulator) < Bindable.Precision)
-                return;
-            Volume += adjustAccumulator;
-            adjustAccumulator = 0;
+            scrollAccumulation += delta * adjust_step * (isPrecise ? 0.1 : 1);
+
+            var precision = Bindable.Precision;
+
+            while (Math.Abs(scrollAccumulation) > precision)
+            {
+                Volume += Math.Sign(scrollAccumulation) * precision;
+                scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
+            }
         }
 
         protected override bool OnScroll(ScrollEvent e)
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index b355d1f349..01df79c06d 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -187,15 +187,19 @@ namespace osu.Game.Screens.Edit
         protected override bool OnScroll(ScrollEvent e)
         {
             scrollAccumulation += e.ScrollDelta.X + e.ScrollDelta.Y * (e.IsPrecise ? 0.1 : 1);
-            if (Math.Abs(scrollAccumulation) < 1)
-                return true;
 
-            if (scrollAccumulation > 0)
-                clock.SeekBackward(!clock.IsRunning);
-            else
-                clock.SeekForward(!clock.IsRunning);
+            const int precision = 1;
+
+            while (Math.Abs(scrollAccumulation) > precision)
+            {
+                if (scrollAccumulation > 0)
+                    clock.SeekBackward(!clock.IsRunning);
+                else
+                    clock.SeekForward(!clock.IsRunning);
+
+                scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
+            }
 
-            scrollAccumulation = 0;
             return true;
         }
 

From b446a73c0c52de46451e9e2d527f6eebbb6f5d9e Mon Sep 17 00:00:00 2001
From: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
Date: Fri, 23 Nov 2018 10:06:06 +0900
Subject: [PATCH 3/3] Add brackets

Co-Authored-By: peppy <pe@ppy.sh>
---
 osu.Game/Screens/Edit/Editor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 01df79c06d..c4fb9dc419 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -186,7 +186,7 @@ namespace osu.Game.Screens.Edit
 
         protected override bool OnScroll(ScrollEvent e)
         {
-            scrollAccumulation += e.ScrollDelta.X + e.ScrollDelta.Y * (e.IsPrecise ? 0.1 : 1);
+            scrollAccumulation += (e.ScrollDelta.X + e.ScrollDelta.Y) * (e.IsPrecise ? 0.1 : 1);
 
             const int precision = 1;