From fdc17d2adb07d81c22f7d1b6ad3c44f277917429 Mon Sep 17 00:00:00 2001
From: HoLLy-HaCKeR <dario.db@hotmail.com>
Date: Sat, 12 Oct 2019 11:51:14 +0200
Subject: [PATCH] Scale OsuResumeCursor with gameplay cursor

---
 .../UI/Cursor/OsuCursorContainer.cs                | 13 ++++++++-----
 osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs       | 14 +++++++++++---
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
index 2b499064fb..8ea11d0a4b 100644
--- a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
@@ -29,9 +29,10 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         private readonly Drawable cursorTrail;
 
+        public IBindable<float> CalculatedCursorScale => calculatedCursorScale;
+        private Bindable<float> calculatedCursorScale;
         private Bindable<float> cursorScale;
         private Bindable<bool> autoCursorScale;
-        private float calculatedCursorScale;
         private readonly IBindable<WorkingBeatmap> beatmap = new Bindable<WorkingBeatmap>();
 
         public OsuCursorContainer()
@@ -57,6 +58,9 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
             autoCursorScale.ValueChanged += _ => calculateScale();
 
+            calculatedCursorScale = new Bindable<float>();
+            calculatedCursorScale.ValueChanged += e => ActiveCursor.Scale = cursorTrail.Scale = new Vector2(e.NewValue);
+
             calculateScale();
         }
 
@@ -70,8 +74,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
                 scale *= 1f - 0.7f * (1f + beatmap.Value.BeatmapInfo.BaseDifficulty.CircleSize - BeatmapDifficulty.DEFAULT_DIFFICULTY) / BeatmapDifficulty.DEFAULT_DIFFICULTY;
             }
 
-            calculatedCursorScale = scale;
-            ActiveCursor.Scale = cursorTrail.Scale = new Vector2(scale);
+            calculatedCursorScale.Value = scale;
         }
 
         protected override void LoadComplete()
@@ -127,13 +130,13 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
         protected override void PopIn()
         {
             fadeContainer.FadeTo(1, 300, Easing.OutQuint);
-            ActiveCursor.ScaleTo(calculatedCursorScale, 400, Easing.OutQuint);
+            ActiveCursor.ScaleTo(calculatedCursorScale.Value, 400, Easing.OutQuint);
         }
 
         protected override void PopOut()
         {
             fadeContainer.FadeTo(0.05f, 450, Easing.OutQuint);
-            ActiveCursor.ScaleTo(calculatedCursorScale * 0.8f, 450, Easing.OutQuint);
+            ActiveCursor.ScaleTo(calculatedCursorScale.Value * 0.8f, 450, Easing.OutQuint);
         }
 
         private class DefaultCursorTrail : CursorTrail
diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
index 9e5df0d6b1..9033817115 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -38,7 +38,13 @@ namespace osu.Game.Rulesets.Osu.UI
             clickToResumeCursor.ShowAt(GameplayCursor.ActiveCursor.Position);
 
             if (localCursorContainer == null)
-                Add(localCursorContainer = new OsuCursorContainer());
+            {
+                var newContainer = new OsuCursorContainer();
+                Add(localCursorContainer = newContainer);
+
+                clickToResumeCursor.CursorScale = newContainer.CalculatedCursorScale.Value;
+                newContainer.CalculatedCursorScale.ValueChanged += e => clickToResumeCursor.CursorScale = e.NewValue;
+            }
         }
 
         public override void Hide()
@@ -57,6 +63,8 @@ namespace osu.Game.Rulesets.Osu.UI
 
             public Action ResumeRequested;
 
+            public float CursorScale;
+
             public OsuClickToResumeCursor()
             {
                 RelativePositionAxes = Axes.Both;
@@ -82,7 +90,7 @@ namespace osu.Game.Rulesets.Osu.UI
                     case OsuAction.RightButton:
                         if (!IsHovered) return false;
 
-                        this.ScaleTo(new Vector2(2), TRANSITION_TIME, Easing.OutQuint);
+                        this.ScaleTo(2 * CursorScale, TRANSITION_TIME, Easing.OutQuint);
 
                         ResumeRequested?.Invoke();
                         return true;
@@ -97,7 +105,7 @@ namespace osu.Game.Rulesets.Osu.UI
             {
                 updateColour();
                 this.MoveTo(activeCursorPosition);
-                this.ScaleTo(new Vector2(4)).Then().ScaleTo(Vector2.One, 1000, Easing.OutQuint);
+                this.ScaleTo(4 * CursorScale).Then().ScaleTo(CursorScale, 1000, Easing.OutQuint);
             });
 
             private void updateColour()