From 5970a68e2d12f4f8fc3a118cf68da7a69c1f1fcf Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Tue, 9 Jan 2024 14:17:33 +0900
Subject: [PATCH] Use invalidation based logic for child anchor position
 updpates in `DrawableSlider`

---
 .../Objects/Drawables/DrawableSlider.cs       | 25 ++++++++-----------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index 6cc8b8e935..4099d47d61 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -11,6 +11,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Framework.Layout;
 using osu.Game.Audio;
 using osu.Game.Graphics.Containers;
 using osu.Game.Rulesets.Objects;
@@ -36,8 +37,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
 
         private ShakeContainer shakeContainer;
 
-        private Vector2? childAnchorPosition;
-
         protected override IEnumerable<Drawable> DimmablePieces => new Drawable[]
         {
             HeadCircle,
@@ -68,6 +67,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private Container<DrawableSliderRepeat> repeatContainer;
         private PausableSkinnableSound slidingSample;
 
+        private readonly LayoutValue drawSizeLayout;
+
         public DrawableSlider()
             : this(null)
         {
@@ -84,6 +85,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 AlwaysPresent = true,
                 Alpha = 0
             };
+            AddLayout(drawSizeLayout = new LayoutValue(Invalidation.DrawSize | Invalidation.MiscGeometry));
         }
 
         [BackgroundDependencyLoader]
@@ -121,11 +123,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
                 }
             });
 
-            PositionBindable.BindValueChanged(_ =>
-            {
-                Position = HitObject.StackedPosition;
-                childAnchorPosition = null;
-            });
+            PositionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
             StackHeightBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
             ScaleBindable.BindValueChanged(scale => Ball.Scale = new Vector2(scale.NewValue));
 
@@ -258,17 +256,14 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             Size = SliderBody?.Size ?? Vector2.Zero;
             OriginPosition = SliderBody?.PathOffset ?? Vector2.Zero;
 
-            if (DrawSize != Vector2.Zero)
+            if (!drawSizeLayout.IsValid)
             {
                 Vector2 pos = Vector2.Divide(OriginPosition, DrawSize);
+                foreach (var obj in NestedHitObjects)
+                    obj.RelativeAnchorPosition = pos;
+                Ball.RelativeAnchorPosition = pos;
 
-                if (pos != childAnchorPosition)
-                {
-                    childAnchorPosition = pos;
-                    foreach (var obj in NestedHitObjects)
-                        obj.RelativeAnchorPosition = pos;
-                    Ball.RelativeAnchorPosition = pos;
-                }
+                drawSizeLayout.Validate();
             }
         }