h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 04:09:54 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10216 from peppy/fix-taiko-change-handling

Browse Source 
Fix taiko change handling
This commit is contained in:
Dan Balasescu
2020-09-23 20:53:09 +09:00
committed by GitHub
Unverified
parent d1e41e41f7 37af9e767f
commit ea6e61e092
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Rulesets.Taiko/Edit/TaikoSelectionHandler.cs
+8
View File
@@ -22,6 +22,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
yield return new TernaryStateMenuItem("Rim", action: state =>
{
ChangeHandler.BeginChange();
foreach (var h in hits)
{
switch (state)
@@ -35,6 +37,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
break;
}
}
ChangeHandler.EndChange();
})
{
State = { Value = getTernaryState(hits, h => h.Type == HitType.Rim) }
@@ -47,6 +51,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
yield return new TernaryStateMenuItem("Strong", action: state =>
{
ChangeHandler.BeginChange();
foreach (var h in hits)
{
switch (state)
@@ -62,6 +68,8 @@ namespace osu.Game.Rulesets.Taiko.Edit
EditorBeatmap?.UpdateHitObject(h);
}
ChangeHandler.EndChange();
})
{
State = { Value = getTernaryState(hits, h => h.IsStrong) }
osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+9 -9
View File
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
protected EditorBeatmap EditorBeatmap { get; private set; }
[Resolved(CanBeNull = true)]
private IEditorChangeHandler changeHandler { get; set; }
protected IEditorChangeHandler ChangeHandler { get; private set; }
public SelectionHandler()
{
@@ -194,12 +194,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
private void deleteSelected()
{
changeHandler?.BeginChange();
ChangeHandler?.BeginChange();
foreach (var h in selectedBlueprints.ToList())
EditorBeatmap?.Remove(h.HitObject);
changeHandler?.EndChange();
ChangeHandler?.EndChange();
}
#endregion
@@ -255,7 +255,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="sampleName">The name of the hit sample.</param>
public void AddHitSample(string sampleName)
{
changeHandler?.BeginChange();
ChangeHandler?.BeginChange();
foreach (var h in SelectedHitObjects)
{
@@ -266,7 +266,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
h.Samples.Add(new HitSampleInfo { Name = sampleName });
}
changeHandler?.EndChange();
ChangeHandler?.EndChange();
}
/// <summary>
@@ -276,7 +276,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <exception cref="InvalidOperationException">Throws if any selected object doesn't implement <see cref="IHasComboInformation"/></exception>
public void SetNewCombo(bool state)
{
changeHandler?.BeginChange();
ChangeHandler?.BeginChange();
foreach (var h in SelectedHitObjects)
{
@@ -289,7 +289,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
EditorBeatmap?.UpdateHitObject(h);
}
changeHandler?.EndChange();
ChangeHandler?.EndChange();
}
/// <summary>
@@ -298,12 +298,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="sampleName">The name of the hit sample.</param>
public void RemoveHitSample(string sampleName)
{
changeHandler?.BeginChange();
ChangeHandler?.BeginChange();
foreach (var h in SelectedHitObjects)
h.SamplesBindable.RemoveAll(s => s.Name == sampleName);
changeHandler?.EndChange();
ChangeHandler?.EndChange();
}
#endregion