h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-13 22:13:20 +08:00
Code Issues Releases Wiki Activity

Make SelectionHandler require EditorBeatmap presence

Browse Source
This commit is contained in:
Dean Herbert 2020-10-09 21:44:10 +09:00
parent 681e88af40
commit b0f8a7794a
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
View File

@ -43,7 +43,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected SelectionBox SelectionBox { get; private set; } protected SelectionBox SelectionBox { get; private set; }
[Resolved(CanBeNull = true)] [Resolved]
protected EditorBeatmap EditorBeatmap { get; private set; } protected EditorBeatmap EditorBeatmap { get; private set; }
[Resolved(CanBeNull = true)] [Resolved(CanBeNull = true)]
@ -243,7 +243,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
private void deleteSelected() private void deleteSelected()
{ {
EditorBeatmap?.RemoveRange(selectedBlueprints.Select(b => b.HitObject)); EditorBeatmap.RemoveRange(selectedBlueprints.Select(b => b.HitObject));
} }
#endregion #endregion
@ -310,7 +310,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="sampleName">The name of the hit sample.</param> /// <param name="sampleName">The name of the hit sample.</param>
public void AddHitSample(string sampleName) public void AddHitSample(string sampleName)
{ {
EditorBeatmap?.BeginChange(); EditorBeatmap.BeginChange();
foreach (var h in EditorBeatmap.SelectedHitObjects) foreach (var h in EditorBeatmap.SelectedHitObjects)
{ {
@ -321,7 +321,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
h.Samples.Add(new HitSampleInfo { Name = sampleName }); h.Samples.Add(new HitSampleInfo { Name = sampleName });
} }
EditorBeatmap?.EndChange(); EditorBeatmap.EndChange();
} }
/// <summary> /// <summary>
@ -331,7 +331,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception> /// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
public void SetNewCombo(bool state) public void SetNewCombo(bool state)
{ {
EditorBeatmap?.BeginChange(); EditorBeatmap.BeginChange();
foreach (var h in EditorBeatmap.SelectedHitObjects) foreach (var h in EditorBeatmap.SelectedHitObjects)
{ {
@ -340,10 +340,10 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (comboInfo == null || comboInfo.NewCombo == state) continue; if (comboInfo == null || comboInfo.NewCombo == state) continue;
comboInfo.NewCombo = state; comboInfo.NewCombo = state;
EditorBeatmap?.Update(h); EditorBeatmap.Update(h);
} }
EditorBeatmap?.EndChange(); EditorBeatmap.EndChange();
} }
/// <summary> /// <summary>
@ -352,12 +352,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="sampleName">The name of the hit sample.</param> /// <param name="sampleName">The name of the hit sample.</param>
public void RemoveHitSample(string sampleName) public void RemoveHitSample(string sampleName)
{ {
EditorBeatmap?.BeginChange(); EditorBeatmap.BeginChange();
foreach (var h in EditorBeatmap.SelectedHitObjects) foreach (var h in EditorBeatmap.SelectedHitObjects)
h.SamplesBindable.RemoveAll(s => s.Name == sampleName); h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
EditorBeatmap?.EndChange(); EditorBeatmap.EndChange();
} }
#endregion #endregion