From ce845a9f8d5748c0ef1ca35edcde6e5469abb076 Mon Sep 17 00:00:00 2001
From: Swords <Ibrahimhizmul@gmail.com>
Date: Tue, 25 May 2021 21:00:38 +1000
Subject: [PATCH] Apply the rest of requested changes

---
 .../Overlays/KeyBinding/BasicKeyBindingRow.cs |  5 +---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 30 +++++++------------
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/KeyBinding/BasicKeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/BasicKeyBindingRow.cs
index acdf273622..91d9aa70bd 100644
--- a/osu.Game/Overlays/KeyBinding/BasicKeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/BasicKeyBindingRow.cs
@@ -37,10 +37,7 @@ namespace osu.Game.Overlays.KeyBinding
         private FillFlowContainer cancelAndClearButtons;
         private FillFlowContainer<KeyButton> buttons;
 
-        public Bindable<bool> IsDefault { get; } = new BindableBool(true)
-        {
-            Default = true
-        };
+        public Bindable<bool> IsDefault { get; } = new BindableBool(true);
 
         public BasicKeyBindingRow(object action, IEnumerable<Framework.Input.Bindings.KeyBinding> bindings)
         {
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 3221b66bce..f799b4810f 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -32,41 +32,33 @@ namespace osu.Game.Overlays.KeyBinding
 
         public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend(key.ToString());
 
-        public KeyBindingRow(
-            object key,
-            ICollection<Input.Bindings.DatabasedKeyBinding> bindings,
-            RulesetInfo ruleset,
-            IEnumerable<KeyCombination> defaults)
-        {
+        public KeyBindingRow(object key, ICollection<Input.Bindings.DatabasedKeyBinding> bindings, RulesetInfo ruleset, IEnumerable<KeyCombination> defaults) {
             this.key = key;
             this.bindings = bindings;
 
-            RestoreDefaultValueButton<bool> restoreDefaultButton;
-
             RelativeSizeAxes = Axes.X;
             AutoSizeAxes = Axes.Y;
             Padding = new MarginPadding { Right = SettingsPanel.CONTENT_MARGINS };
 
-            BasicKeyBindingRow = new BasicKeyBindingRow(key, bindings.Where(b => ((int)b.Action).Equals((int)key)))
-            {
-                AllowMainMouseButtons = ruleset != null,
-                Defaults = defaults
-            };
-
             InternalChildren = new Drawable[]
             {
-                restoreDefaultButton = new RestoreDefaultValueButton<bool>(),
+                new RestoreDefaultValueButton<bool>()
+                {
+                    Current = BasicKeyBindingRow.IsDefault,
+                    Action = () => { BasicKeyBindingRow.RestoreDefaults(); }
+                },
                 new FillFlowContainer
                 {
                     RelativeSizeAxes = Axes.X,
                     AutoSizeAxes = Axes.Y,
                     Padding = new MarginPadding { Left = SettingsPanel.CONTENT_MARGINS },
-                    Child = BasicKeyBindingRow
+                    Child = BasicKeyBindingRow = new BasicKeyBindingRow(key, bindings.Where(b => ((int)b.Action).Equals((int)key)))
+                    {
+                        AllowMainMouseButtons = ruleset != null,
+                        Defaults = defaults
+                    }
                 },
             };
-
-            restoreDefaultButton.Action = () => { BasicKeyBindingRow.RestoreDefaults(); };
-            restoreDefaultButton.Current = BasicKeyBindingRow.IsDefault;
         }
     }
 }