Merge pull request #30063 from bdach/snap-sliders-on-path-type-change

Ensure sliders are snapped when changing path types
ppy · Oct 1, 2024 · 0bff7e8 · 0bff7e8
2 parents 7d756d0 + 493dcc7
commit 0bff7e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs b/osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
@@ -353,6 +353,8 @@ private void updatePathTypeOfSelectedPieces(PathType? type)
         {
             changeHandler?.BeginChange();
 
+            double originalDistance = hitObject.Path.Distance;
+
             foreach (var p in Pieces.Where(p => p.IsSelected.Value))
             {
                 var pointsInSegment = hitObject.Path.PointsInSegment(p.ControlPoint);
@@ -375,6 +377,11 @@ private void updatePathTypeOfSelectedPieces(PathType? type)
 
             EnsureValidPathTypes();
 
+            if (hitObject.Path.Distance < originalDistance)
+                hitObject.SnapTo(distanceSnapProvider);
+            else
+                hitObject.Path.ExpectedDistance.Value = originalDistance;
+
             changeHandler?.EndChange();
         }
 

diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -112,6 +112,7 @@ public void TestConversionsWithSliderVelocity()
             {
                 SliderVelocityMultiplier = slider_velocity
             };
+            AddStep("add to beatmap", () => composer.EditorBeatmap.Add(referenceObject));
 
             assertSnapDistance(base_distance * slider_velocity, referenceObject, true);
             assertSnappedDistance(base_distance * slider_velocity + 10, base_distance * slider_velocity, referenceObject);