Merge branch 'master' into more-timeline-toggles

This commit is contained in:
Dan Balasescu
2020-10-05 17:33:18 +09:00
committed by GitHub
47 changed files with 312 additions and 110 deletions

View File

@ -81,6 +81,9 @@ namespace osu.Game.Screens.Edit.Timing
[Resolved]
private Bindable<ControlPointGroup> selectedGroup { get; set; }
[Resolved(canBeNull: true)]
private IEditorChangeHandler changeHandler { get; set; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
@ -140,6 +143,7 @@ namespace osu.Game.Screens.Edit.Timing
controlGroups.BindCollectionChanged((sender, args) =>
{
table.ControlGroups = controlGroups;
changeHandler.SaveState();
}, true);
}