From ef114f240799be93ef7448e7bf33da9693390dd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 17 May 2021 20:57:48 +0200
Subject: [PATCH] Simplify bindable flow in `KeyBindingRow`

---
 osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 45 ++++++++++---------
 .../KeyBinding/RestorableKeyBindingRow.cs     |  4 +-
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 7e81f64458..33f32493ad 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -11,7 +11,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
-using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Bindings;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
@@ -24,7 +23,7 @@ using osuTK.Input;
 
 namespace osu.Game.Overlays.KeyBinding
 {
-    public class KeyBindingRow : Container, IFilterable, IHasCurrentValue<bool>
+    public class KeyBindingRow : Container, IFilterable
     {
         private readonly object action;
         private readonly IEnumerable<Framework.Input.Bindings.KeyBinding> bindings;
@@ -53,17 +52,11 @@ namespace osu.Game.Overlays.KeyBinding
         private FillFlowContainer cancelAndClearButtons;
         private FillFlowContainer<KeyButton> buttons;
 
-        private readonly BindableWithCurrent<bool> isKeysDefaultValue = new BindableWithCurrent<bool>
+        public Bindable<bool> IsDefault { get; } = new BindableBool(true)
         {
             Default = true
         };
 
-        public Bindable<bool> Current
-        {
-            get => isKeysDefaultValue.Current;
-            set => isKeysDefaultValue.Current = value;
-        }
-
         public IEnumerable<string> FilterTerms => bindings.Select(b => b.KeyCombination.ReadableString()).Prepend(text.Text.ToString());
 
         public KeyBindingRow(object action, IEnumerable<Framework.Input.Bindings.KeyBinding> bindings)
@@ -83,15 +76,7 @@ namespace osu.Game.Overlays.KeyBinding
         [BackgroundDependencyLoader]
         private void load(OsuColour colours)
         {
-            isKeysDefaultValue.Value = bindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
-            isKeysDefaultValue.BindValueChanged(resetButtons =>
-            {
-                if (resetButtons.NewValue && !bindings.Select(b => b.KeyCombination).SequenceEqual(Defaults))
-                {
-                    RestoreDefaults();
-                    finalise();
-                }
-            });
+            updateIsDefaultValue();
 
             EdgeEffect = new EdgeEffectParameters
             {
@@ -140,6 +125,24 @@ namespace osu.Game.Overlays.KeyBinding
                 buttons.Add(new KeyButton(b));
         }
 
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            IsDefault.BindValueChanged(resetButtons =>
+            {
+                if (resetButtons.NewValue && !computeIsDefaultValue())
+                {
+                    RestoreDefaults();
+                    finalise();
+                }
+            });
+        }
+
+        private void updateIsDefaultValue() => IsDefault.Value = computeIsDefaultValue();
+
+        private bool computeIsDefaultValue() => bindings.Select(b => b.KeyCombination).SequenceEqual(Defaults);
+
         public void RestoreDefaults()
         {
             int i = 0;
@@ -151,7 +154,7 @@ namespace osu.Game.Overlays.KeyBinding
                 store.Update(button.KeyBinding);
             }
 
-            isKeysDefaultValue.Value = true;
+            updateIsDefaultValue();
         }
 
         protected override bool OnHover(HoverEvent e)
@@ -311,7 +314,7 @@ namespace osu.Game.Overlays.KeyBinding
             {
                 store.Update(bindTarget.KeyBinding);
 
-                isKeysDefaultValue.Value = buttons.Select(b => b.KeyBinding.KeyCombination).SequenceEqual(Defaults);
+                updateIsDefaultValue();
 
                 bindTarget.IsBinding = false;
                 Schedule(() =>
@@ -476,4 +479,4 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Overlays/KeyBinding/RestorableKeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/RestorableKeyBindingRow.cs
index 0461ae4f35..b09c21378e 100644
--- a/osu.Game/Overlays/KeyBinding/RestorableKeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/RestorableKeyBindingRow.cs
@@ -65,7 +65,7 @@ namespace osu.Game.Overlays.KeyBinding
                 },
             };
 
-            restoreDefaultButton.Current = KeyBindingRow.Current;
+            restoreDefaultButton.Current = KeyBindingRow.IsDefault;
         }
     }
-}
\ No newline at end of file
+}