Merge pull request #26148 from rushiiMachine/resumeoverlay-min-cursor…

…-size Force minimum cursor size for `OsuResumeOverlay`
ppy · Dec 28, 2023 · c7f10db · c7f10db
2 parents f5a3124 + c087578
commit c7f10db
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs b/osu.Game.Rulesets.Osu/UI/Cursor/OsuCursor.cs
@@ -70,21 +70,21 @@ private void load()
             };
 
             userCursorScale = config.GetBindable<float>(OsuSetting.GameplayCursorSize);
-            userCursorScale.ValueChanged += _ => calculateCursorScale();
+            userCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
 
             autoCursorScale = config.GetBindable<bool>(OsuSetting.AutoCursorSize);
-            autoCursorScale.ValueChanged += _ => calculateCursorScale();
+            autoCursorScale.ValueChanged += _ => cursorScale.Value = CalculateCursorScale();
 
             cursorScale.BindValueChanged(e => cursorScaleContainer.Scale = new Vector2(e.NewValue), true);
         }
 
         protected override void LoadComplete()
         {
             base.LoadComplete();
-            calculateCursorScale();
+            cursorScale.Value = CalculateCursorScale();
         }
 
-        private void calculateCursorScale()
+        protected virtual float CalculateCursorScale()
         {
             float scale = userCursorScale.Value;
 
@@ -94,7 +94,7 @@ private void calculateCursorScale()
                 scale *= GetScaleForCircleSize(state.Beatmap.Difficulty.CircleSize);
             }
 
-            cursorScale.Value = scale;
+            return scale;
         }
 
         protected override void SkinChanged(ISkinSource skin)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs b/osu.Game.Rulesets.Osu/UI/OsuResumeOverlay.cs
@@ -71,6 +71,12 @@ public OsuClickToResumeCursor()
                 RelativePositionAxes = Axes.Both;
             }
 
+            protected override float CalculateCursorScale()
+            {
+                // Force minimum cursor size so it's easily clickable
+                return Math.Max(1f, base.CalculateCursorScale());
+            }
+
             protected override bool OnHover(HoverEvent e)
             {
                 updateColour();