From e36bb7631d0bc5abcd4ea82e4b90882afb322327 Mon Sep 17 00:00:00 2001
From: ekrctb <ekrctb@gmail.com>
Date: Fri, 27 Nov 2020 11:41:39 +0900
Subject: [PATCH] Fix colour not updated when index changes

---
 .../Objects/Drawables/DrawableFruit.cs          | 17 -----------------
 .../Drawables/DrawablePalpableCatchHitObject.cs |  8 ++++++++
 .../Objects/Drawables/DrawableHitObject.cs      |  6 +++---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
index d53bcd3a6f..e98f410724 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawableFruit.cs
@@ -12,8 +12,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 {
     public class DrawableFruit : DrawablePalpableCatchHitObject
     {
-        public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
-
         public readonly Bindable<FruitVisualRepresentation> VisualRepresentation = new Bindable<FruitVisualRepresentation>();
 
         protected virtual FruitVisualRepresentation GetVisualRepresentation(int indexInBeatmap) => (FruitVisualRepresentation)(indexInBeatmap % 4);
@@ -23,7 +21,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
         public DrawableFruit(CatchHitObject h)
             : base(h)
         {
-            IndexInBeatmap.Value = h.IndexInBeatmap;
         }
 
         [BackgroundDependencyLoader]
@@ -51,20 +48,6 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 });
         }
 
-        protected override void OnApply()
-        {
-            base.OnApply();
-
-            IndexInBeatmap.BindTo(HitObject.IndexInBeatmapBindable);
-        }
-
-        protected override void OnFree()
-        {
-            IndexInBeatmap.UnbindFrom(HitObject.IndexInBeatmapBindable);
-
-            base.OnFree();
-        }
-
         protected override void Update()
         {
             base.Update();
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
index 95f90a3eee..f44e290627 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawables/DrawablePalpableCatchHitObject.cs
@@ -17,6 +17,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
         public Bindable<float> ScaleBindable { get; } = new Bindable<float>(1);
 
+        public readonly Bindable<int> IndexInBeatmap = new Bindable<int>();
+
         /// <summary>
         /// The multiplicative factor applied to <see cref="ScaleContainer"/> scale relative to <see cref="HitObject"/> scale.
         /// </summary>
@@ -41,6 +43,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
                 Origin = Anchor.Centre,
                 Anchor = Anchor.Centre,
             });
+
+            IndexInBeatmap.Value = h.IndexInBeatmap;
         }
 
         [BackgroundDependencyLoader]
@@ -55,6 +59,8 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
             {
                 ScaleContainer.Scale = new Vector2(scale.NewValue * ScaleFactor);
             }, true);
+
+            IndexInBeatmap.BindValueChanged(_ => UpdateComboColour());
         }
 
         protected override void OnApply()
@@ -63,12 +69,14 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawables
 
             HyperDash.BindTo(HitObject.HyperDashBindable);
             ScaleBindable.BindTo(HitObject.ScaleBindable);
+            IndexInBeatmap.BindTo(HitObject.IndexInBeatmapBindable);
         }
 
         protected override void OnFree()
         {
             HyperDash.UnbindFrom(HitObject.HyperDashBindable);
             ScaleBindable.UnbindFrom(HitObject.ScaleBindable);
+            IndexInBeatmap.UnbindFrom(HitObject.IndexInBeatmapBindable);
 
             base.OnFree();
         }
diff --git a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
index 9c799bcf32..182aa1dbe3 100644
--- a/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
+++ b/osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.LoadComplete();
 
-            comboIndexBindable.BindValueChanged(_ => updateComboColour(), true);
+            comboIndexBindable.BindValueChanged(_ => UpdateComboColour(), true);
 
             updateState(ArmedState.Idle, true);
         }
@@ -533,7 +533,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
         {
             base.SkinChanged(skin, allowFallback);
 
-            updateComboColour();
+            UpdateComboColour();
 
             ApplySkin(skin, allowFallback);
 
@@ -541,7 +541,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
                 updateState(State.Value, true);
         }
 
-        private void updateComboColour()
+        protected void UpdateComboColour()
         {
             if (!(HitObject is IHasComboInformation combo)) return;