From 8956768fe0d49a9d433b7ff88b601f4d6dd90e1e Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 8 Dec 2019 08:55:45 -0800
Subject: [PATCH 1/3] Fix mod buttons being selected when drag scrolling
 overlay

---
 osu.Game/Overlays/Mods/ModButton.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index c6b4787ff1..ce623dc182 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -167,10 +167,6 @@ protected override bool OnMouseUp(MouseUpEvent e)
             {
                 switch (e.Button)
                 {
-                    case MouseButton.Left:
-                        SelectNext(1);
-                        break;
-
                     case MouseButton.Right:
                         SelectNext(-1);
                         break;
@@ -180,6 +176,15 @@ protected override bool OnMouseUp(MouseUpEvent e)
             return true;
         }
 
+        protected override bool OnClick(ClickEvent e)
+        {
+            scaleContainer.ScaleTo(1, 500, Easing.OutElastic);
+            
+            SelectNext(1);
+
+            return base.OnClick(e);
+        }
+
         /// <summary>
         /// Select the next available mod in a specified direction.
         /// </summary>

From 463b6c00300b1686fe4eb66742ca0f63ea373e03 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 8 Dec 2019 09:04:34 -0800
Subject: [PATCH 2/3] Remove whitespace

---
 osu.Game/Overlays/Mods/ModButton.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index ce623dc182..5af3ebab3b 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -179,7 +179,7 @@ protected override bool OnMouseUp(MouseUpEvent e)
         protected override bool OnClick(ClickEvent e)
         {
             scaleContainer.ScaleTo(1, 500, Easing.OutElastic);
-            
+
             SelectNext(1);
 
             return base.OnClick(e);

From e394b28799f4df5e7e01e87dbed07a8bc50127a2 Mon Sep 17 00:00:00 2001
From: Joehu <madamba.joehu@outlook.com>
Date: Sun, 8 Dec 2019 09:12:32 -0800
Subject: [PATCH 3/3] Remove redundant transform

---
 osu.Game/Overlays/Mods/ModButton.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index 5af3ebab3b..69a4a4181a 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -178,11 +178,9 @@ protected override bool OnMouseUp(MouseUpEvent e)
 
         protected override bool OnClick(ClickEvent e)
         {
-            scaleContainer.ScaleTo(1, 500, Easing.OutElastic);
-
             SelectNext(1);
 
-            return base.OnClick(e);
+            return true;
         }
 
         /// <summary>