h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-29 05:52:56 +08:00
Code Issues Releases Wiki Activity

Move helper method to bottom of class

Browse Source
This commit is contained in:
Dean Herbert 2022-08-30 02:51:42 +09:00
parent d50e9caa11
commit 2e5770be4e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Rulesets.Osu/Edit/OsuSelectionHandler.cs
View File

@ -354,9 +354,6 @@ namespace osu.Game.Rulesets.Osu.Edit
.OrderBy(h => h.StartTime) .OrderBy(h => h.StartTime)
.ToArray(); .ToArray();
private bool canMerge(IReadOnlyList<OsuHitObject> objects) =>
objects.Count > 1 && (objects.Any(h => h is Slider) || Precision.DefinitelyBigger(Vector2.DistanceSquared(objects[0].Position, objects[1].Position), 1));
private void mergeSelection() private void mergeSelection()
{ {
var mergeableObjects = selectedMergeableObjects; var mergeableObjects = selectedMergeableObjects;
@ -451,5 +448,10 @@ namespace osu.Game.Rulesets.Osu.Edit
if (canMerge(selectedMergeableObjects)) if (canMerge(selectedMergeableObjects))
yield return new OsuMenuItem("Merge selection", MenuItemType.Destructive, mergeSelection); yield return new OsuMenuItem("Merge selection", MenuItemType.Destructive, mergeSelection);
} }
private bool canMerge(IReadOnlyList<OsuHitObject> objects) =>
objects.Count > 1
&& (objects.Any(h => h is Slider)
|| Precision.DefinitelyBigger(Vector2.DistanceSquared(objects[0].Position, objects[1].Position), 1));
} }
} }