From 075350e12572188f25d5a8b02fedf1a9edf73f83 Mon Sep 17 00:00:00 2001
From: Ibby <Ibrahimhizmul@gmail.com>
Date: Sun, 9 May 2021 15:51:17 +1000
Subject: [PATCH] Adding a reset button to individual keybinds

---
 .../Settings/TestSceneKeyBindingPanel.cs      | 40 +++++++++++++++++++
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 28 +++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
index f495e0fb23..75bbd8f86c 100644
--- a/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
+++ b/osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs
@@ -104,6 +104,46 @@ namespace osu.Game.Tests.Visual.Settings
             }
         }
 
+        [Test]
+        public void TestSingleBindResetButton()
+        {
+            KeyBindingRow multiBindingRow = null;
+
+            AddStep("click first row with two bindings", () =>
+            {
+                multiBindingRow = panel.ChildrenOfType<KeyBindingRow>().First(row => row.Defaults.Count() > 1);
+                InputManager.MoveMouseTo(multiBindingRow);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            clickSingleBindResetButton();
+
+            AddAssert("first binding cleared", () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(0).KeyBinding.KeyCombination.Equals(multiBindingRow.Defaults.ElementAt(0)));
+
+            AddStep("click second binding", () =>
+            {
+                var target = multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1);
+
+                InputManager.MoveMouseTo(target);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            clickSingleBindResetButton();
+
+            AddAssert("second binding cleared", () => multiBindingRow.ChildrenOfType<KeyBindingRow.KeyButton>().ElementAt(1).KeyBinding.KeyCombination.Equals(multiBindingRow.Defaults.ElementAt(1)));
+
+            void clickSingleBindResetButton()
+            {
+                AddStep("click reset button for single binding", () =>
+                {
+                    var clearButton = multiBindingRow.ChildrenOfType<KeyBindingRow.SingleBindResetButton>().Single();
+
+                    InputManager.MoveMouseTo(clearButton);
+                    InputManager.Click(MouseButton.Left);
+                });
+            }
+        }
+
         [Test]
         public void TestClickRowSelectsFirstBinding()
         {
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 300fce962a..1fbaa374d4 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -109,6 +109,7 @@ namespace osu.Game.Overlays.KeyBinding
                     Children = new Drawable[]
                     {
                         new CancelButton { Action = finalise },
+                        new SingleBindResetButton { Action = singleBindReset },
                         new ClearButton { Action = clear },
                     },
                 }
@@ -281,6 +282,15 @@ namespace osu.Game.Overlays.KeyBinding
             finalise();
         }
 
+        private void singleBindReset()
+        {
+            if (bindTarget == null)
+                return;
+
+            bindTarget.UpdateKeyCombination(Defaults.ElementAt(buttons.IndexOf(bindTarget)));
+            finalise();
+        }
+
         private void finalise()
         {
             if (bindTarget != null)
@@ -339,6 +349,24 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
+        public class SingleBindResetButton : TriangleButton
+        {
+            public SingleBindResetButton()
+            {
+                Text = "Reset";
+                Size = new Vector2(80, 20);
+            }
+
+            [BackgroundDependencyLoader]
+            private void load(OsuColour colours)
+            {
+                BackgroundColour = colours.Green;
+
+                Triangles.ColourDark = colours.GreenDark;
+                Triangles.ColourLight = colours.GreenLight;
+            }
+        }
+
         public class ClearButton : TriangleButton
         {
             public ClearButton()