Merge branch 'master' into fix-mods-masking

ppy · Oct 3, 2024 · ffb133d · ffb133d
2 parents 043c25c + 7c63975
commit ffb133d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/PerformanceCalculatorGUI/PerformanceCalculatorSceneManager.cs b/PerformanceCalculatorGUI/PerformanceCalculatorSceneManager.cs
@@ -42,6 +42,9 @@ public partial class PerformanceCalculatorSceneManager : CompositeDrawable
         [Resolved]
         private DialogOverlay dialogOverlay { get; set; }
 
+        [Cached]
+        private OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Blue);
+
         public PerformanceCalculatorSceneManager()
         {
             RelativeSizeAxes = Axes.Both;

diff --git a/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs b/PerformanceCalculatorGUI/Screens/ObjectInspection/OsuObjectInspectorRuleset.cs
@@ -8,6 +8,7 @@
 using osu.Game.Beatmaps;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Osu.Difficulty.Preprocessing;
 using osu.Game.Rulesets.Osu.Edit;
@@ -88,7 +89,15 @@ private void updateState(DrawableHitObject hitObject, ArmedState state)
                             hitObject.RemoveTransform(existing);
 
                             using (hitObject.BeginAbsoluteSequence(hitObject.StartTimeBindable.Value))
-                                hitObject.Delay(nextHitObject.StartTime - hitObject.StartTimeBindable.Value).FadeOut().Expire();
+                            {
+                                var hitObjectDuration = hitObject.HitObject.GetEndTime() - hitObject.StartTimeBindable.Value;
+
+                                hitObject.Delay(hitObjectDuration)
+                                         .FadeTo(0.25f, 200f, Easing.Out)
+                                         .Delay(nextHitObject.StartTime - hitObject.StartTimeBindable.Value - hitObjectDuration)
+                                         .FadeOut(100f, Easing.Out)
+                                         .Expire();
+                            }
                         }
 
                         break;