h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 10:17:19 +08:00
Code Issues Releases Wiki Activity

Use DI'd components from parent class rather than fetching locally

Browse Source
This commit is contained in:
Dean Herbert 2022-08-16 15:35:32 +09:00
parent d140e0df14
commit e636fcd9b8
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,6 @@ using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.Objects.Types;
using osu.Game.Rulesets.Osu.Objects; using osu.Game.Rulesets.Osu.Objects;
using osu.Game.Rulesets.Osu.UI; using osu.Game.Rulesets.Osu.UI;
using osu.Game.Screens.Edit;
using osu.Game.Screens.Edit.Compose.Components; using osu.Game.Screens.Edit.Compose.Components;
using osuTK; using osuTK;
using osuTK.Input; using osuTK.Input;
@ -28,12 +27,6 @@ namespace osu.Game.Rulesets.Osu.Edit
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
private IDistanceSnapProvider? snapProvider { get; set; } private IDistanceSnapProvider? snapProvider { get; set; }
[Resolved(CanBeNull = true)]
private EditorBeatmap? editorBeatmap { get; set; }
[Resolved(CanBeNull = true)]
private IEditorChangeHandler? changeHandler { get; set; }
/// <summary> /// <summary>
/// During a transform, the initial origin is stored so it can be used throughout the operation. /// During a transform, the initial origin is stored so it can be used throughout the operation.
/// </summary> /// </summary>
@ -355,10 +348,10 @@ namespace osu.Game.Rulesets.Osu.Edit
private void mergeSelection() private void mergeSelection()
{ {
if (editorBeatmap == null || changeHandler == null || selectedMergeableObjects.Length < 2) if (EditorBeatmap == null || ChangeHandler == null || selectedMergeableObjects.Length < 2)
return; return;
changeHandler.BeginChange(); ChangeHandler.BeginChange();
// Have an initial slider object. // Have an initial slider object.
var firstHitObject = selectedMergeableObjects[0]; var firstHitObject = selectedMergeableObjects[0];
@ -416,24 +409,24 @@ namespace osu.Game.Rulesets.Osu.Edit
{ {
foreach (var selectedMergeableObject in selectedMergeableObjects.Skip(1)) foreach (var selectedMergeableObject in selectedMergeableObjects.Skip(1))
{ {
editorBeatmap.Remove(selectedMergeableObject); EditorBeatmap.Remove(selectedMergeableObject);
} }
} }
else else
{ {
foreach (var selectedMergeableObject in selectedMergeableObjects) foreach (var selectedMergeableObject in selectedMergeableObjects)
{ {
editorBeatmap.Remove(selectedMergeableObject); EditorBeatmap.Remove(selectedMergeableObject);
} }
editorBeatmap.Add(mergedHitObject); EditorBeatmap.Add(mergedHitObject);
} }
// Make sure the merged hitobject is selected. // Make sure the merged hitobject is selected.
SelectedItems.Clear(); SelectedItems.Clear();
SelectedItems.Add(mergedHitObject); SelectedItems.Add(mergedHitObject);
changeHandler.EndChange(); ChangeHandler.EndChange();
} }
protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection) protected override IEnumerable<MenuItem> GetContextMenuItemsForSelection(IEnumerable<SelectionBlueprint<HitObject>> selection)