From 957bbee3e4eb4569310eacf11c59f7e167795efe Mon Sep 17 00:00:00 2001
From: iiSaLMaN <slmanarendo1950@gmail.com>
Date: Thu, 3 Oct 2019 05:58:20 +0300
Subject: [PATCH] Scale pieces individually and use skin source directly

---
 .../Objects/Drawables/DrawableHitCircle.cs    | 11 -------
 .../Skinning/LegacyMainCirclePiece.cs         | 30 ++++++++-----------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index bd4cb1f112..c37535521d 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -21,10 +21,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
     {
         public ApproachCircle ApproachCircle { get; }
 
-        public IBindable<bool> ExpandNumberPiece => expandNumberPiece;
-
-        private readonly BindableBool expandNumberPiece = new BindableBool();
-
         private readonly IBindable<Vector2> positionBindable = new Bindable<Vector2>();
         private readonly IBindable<int> stackHeightBindable = new Bindable<int>();
         private readonly IBindable<float> scaleBindable = new Bindable<float>();
@@ -111,13 +107,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             }
         }
 
-        protected override void ApplySkin(ISkinSource skin, bool allowFallback)
-        {
-            base.ApplySkin(skin, allowFallback);
-
-            expandNumberPiece.Value = skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece)?.Value ?? false;
-        }
-
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             Debug.Assert(HitObject.HitWindows != null);
diff --git a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
index d93d0506c3..8ba21d9f89 100644
--- a/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/LegacyMainCirclePiece.cs
@@ -14,8 +14,6 @@ using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Skinning;
 using osuTK;
 using osuTK.Graphics;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace osu.Game.Rulesets.Osu.Skinning
 {
@@ -26,21 +24,21 @@ namespace osu.Game.Rulesets.Osu.Skinning
             Size = new Vector2(OsuHitObject.OBJECT_RADIUS * 2);
         }
 
-        private Sprite hitCircleSprite;
+        private Sprite hitCircleSprite, hitCircleOverlay;
         private SkinnableSpriteText hitCircleText;
 
-        private List<Drawable> scalables;
-
         private readonly IBindable<ArmedState> state = new Bindable<ArmedState>();
         private readonly Bindable<Color4> accentColour = new Bindable<Color4>();
         private readonly IBindable<int> indexInCurrentCombo = new Bindable<int>();
-        private readonly IBindable<bool> expandNumberPiece = new BindableBool();
 
         [Resolved]
         private DrawableHitObject drawableObject { get; set; }
 
+        [Resolved]
+        private ISkinSource skin { get; set; }
+
         [BackgroundDependencyLoader]
-        private void load(ISkinSource skin)
+        private void load()
         {
             OsuHitObject osuObject = (OsuHitObject)drawableObject.HitObject;
             DrawableHitCircle drawableCircle = (DrawableHitCircle)drawableObject;
@@ -59,7 +57,7 @@ namespace osu.Game.Rulesets.Osu.Skinning
                     Font = OsuFont.Numeric.With(size: 40),
                     UseFullGlyphHeight = false,
                 }, confineMode: ConfineMode.NoScaling),
-                new Sprite
+                hitCircleOverlay = new Sprite
                 {
                     Texture = skin.GetTexture("hitcircleoverlay"),
                     Anchor = Anchor.Centre,
@@ -70,7 +68,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             state.BindTo(drawableObject.State);
             accentColour.BindTo(drawableObject.AccentColour);
             indexInCurrentCombo.BindTo(osuObject.IndexInCurrentComboBindable);
-            expandNumberPiece.BindTo(drawableCircle.ExpandNumberPiece);
         }
 
         protected override void LoadComplete()
@@ -80,13 +77,6 @@ namespace osu.Game.Rulesets.Osu.Skinning
             state.BindValueChanged(updateState, true);
             accentColour.BindValueChanged(colour => hitCircleSprite.Colour = colour.NewValue, true);
             indexInCurrentCombo.BindValueChanged(index => hitCircleText.Text = (index.NewValue + 1).ToString(), true);
-            expandNumberPiece.BindValueChanged(expand =>
-            {
-                scalables = InternalChildren.ToList();
-
-                if (!expand.NewValue)
-                    scalables.Remove(hitCircleText);
-            }, true);
         }
 
         private void updateState(ValueChangedEvent<ArmedState> state)
@@ -97,7 +87,13 @@ namespace osu.Game.Rulesets.Osu.Skinning
             {
                 case ArmedState.Hit:
                     this.FadeOut(legacy_fade_duration, Easing.Out);
-                    scalables.ForEach(d => d.ScaleTo(1.4f, legacy_fade_duration, Easing.Out));
+
+                    hitCircleSprite.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+                    hitCircleOverlay.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+
+                    if (skin.GetConfig<OsuSkinConfiguration, bool>(OsuSkinConfiguration.ExpandNumberPiece).Value)
+                        hitCircleText.ScaleTo(1.4f, legacy_fade_duration, Easing.Out);
+
                     break;
             }
         }