From c9458fd9cec36e9d9407f4210fa39bf9bbef4ab1 Mon Sep 17 00:00:00 2001
From: Salman Ahmed <frenzibyte@gmail.com>
Date: Thu, 17 Jun 2021 04:57:29 +0300
Subject: [PATCH] Hide spinner approach circle in "Hidden" mod

---
 osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs                 | 3 +++
 osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs | 7 +++++++
 osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs     | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
index 2752feb0a1..bec4c62e0f 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
@@ -110,6 +110,9 @@ namespace osu.Game.Rulesets.Osu.Mods
                     // hide elements we don't care about.
                     // todo: hide background
 
+                    using (spinner.BeginAbsoluteSequence(hitObject.StartTime - hitObject.TimePreempt))
+                        spinner.HideApproachCircle();
+
                     using (spinner.BeginAbsoluteSequence(fadeStartTime))
                         spinner.FadeOut(fadeDuration);
 
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
index 19cee61f26..942cc52c50 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSpinner.cs
@@ -42,6 +42,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
         private const float spinning_sample_initial_frequency = 1.0f;
         private const float spinning_sample_modulated_base_frequency = 0.5f;
 
+        internal readonly Bindable<Visibility> ApproachCircleVisibility = new Bindable<Visibility>(Visibility.Visible);
+
         /// <summary>
         /// The amount of bonus score gained from spinning after the required number of spins, for display purposes.
         /// </summary>
@@ -285,6 +287,11 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
             updateBonusScore();
         }
 
+        /// <summary>
+        /// Hides the spinner's approach circle if it has one.
+        /// </summary>
+        public void HideApproachCircle() => this.TransformBindableTo(ApproachCircleVisibility, Visibility.Hidden);
+
         private static readonly int score_per_tick = new SpinnerBonusTick.OsuSpinnerBonusTickJudgement().MaxNumericResult;
 
         private int wholeSpins;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
index 259f16ca5e..5b0c2d405b 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Legacy/LegacySpinner.cs
@@ -125,6 +125,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
             }
         }
 
+        private IBindable<Visibility> approachCircleVisibility;
         private IBindable<double> gainedBonus;
         private IBindable<double> spinsPerMinute;
 
@@ -134,6 +135,12 @@ namespace osu.Game.Rulesets.Osu.Skinning.Legacy
         {
             base.LoadComplete();
 
+            approachCircleVisibility = DrawableSpinner.ApproachCircleVisibility.GetBoundCopy();
+            approachCircleVisibility.BindValueChanged(v =>
+            {
+                approachCircle.Alpha = v.NewValue == Visibility.Hidden ? 0 : 1;
+            }, true);
+
             gainedBonus = DrawableSpinner.GainedBonus.GetBoundCopy();
             gainedBonus.BindValueChanged(bonus =>
             {