From 2a18625b2c95f2f2fda8981365f177417e339969 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 13 Jun 2018 16:46:27 +0900
Subject: [PATCH] Correctly block scroll events when hovering controls

---
 osu.Game/Overlays/Volume/VolumeMeter.cs | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Overlays/Volume/VolumeMeter.cs b/osu.Game/Overlays/Volume/VolumeMeter.cs
index 451809867d..29fef48d13 100644
--- a/osu.Game/Overlays/Volume/VolumeMeter.cs
+++ b/osu.Game/Overlays/Volume/VolumeMeter.cs
@@ -177,12 +177,13 @@ namespace osu.Game.Overlays.Volume
         {
             float amount = adjust_step * direction;
 
-            var mouse = GetContainingInputManager().CurrentState.Mouse;
-            if (mouse.HasPreciseScroll)
+            // handle the case where the OnPressed action was actually a mouse wheel.
+            // this allows for precise wheel handling.
+            var state = GetContainingInputManager().CurrentState;
+            if (state.Mouse?.ScrollDelta.Y != 0)
             {
-                float scrollDelta = mouse.ScrollDelta.Y;
-                if (scrollDelta != 0)
-                    amount *= Math.Abs(scrollDelta / 10);
+                OnScroll(state);
+                return;
             }
 
             Volume += amount;
@@ -205,6 +206,14 @@ namespace osu.Game.Overlays.Volume
             return false;
         }
 
+        protected override bool OnScroll(InputState state)
+        {
+            double amount = adjust_step * state.Mouse.ScrollDelta.Y * (state.Mouse.HasPreciseScroll ? 0.5f : 1);
+
+            Volume += Math.Sign(amount) * Math.Max(0.01, Math.Abs(amount));
+            return true;
+        }
+
         public bool OnReleased(GlobalAction action) => false;
 
         private const float transition_length = 500;