Merge branch 'master' into slider-controlpoint-addition

This commit is contained in:
Dean Herbert
2019-11-12 18:13:27 +09:00
committed by GitHub
15 changed files with 191 additions and 78 deletions

View File

@ -80,8 +80,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
switch (action.ActionMethod)
{
case PlatformActionMethod.Delete:
foreach (var h in selectedBlueprints.ToList())
placementHandler.Delete(h.DrawableObject.HitObject);
deleteSelected();
return true;
}
@ -144,6 +143,12 @@ namespace osu.Game.Screens.Edit.Compose.Components
UpdateVisibility();
}
private void deleteSelected()
{
foreach (var h in selectedBlueprints.ToList())
placementHandler.Delete(h.DrawableObject.HitObject);
}
#endregion
#region Outline Display
@ -234,7 +239,8 @@ namespace osu.Game.Screens.Edit.Compose.Components
createHitSampleMenuItem("Clap", HitSampleInfo.HIT_CLAP),
createHitSampleMenuItem("Finish", HitSampleInfo.HIT_FINISH)
}
}
},
new OsuMenuItem("Delete", MenuItemType.Destructive, deleteSelected),
};
if (selectedBlueprints.Count == 1)