Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2

This commit is contained in:
Dean Herbert
2019-11-06 16:22:55 +09:00
83 changed files with 1606 additions and 526 deletions

View File

@ -32,18 +32,13 @@ namespace osu.Game.Screens.Edit.Timing
});
}
protected override void LoadComplete()
protected override void OnControlPointChanged(ValueChangedEvent<TimingControlPoint> point)
{
base.LoadComplete();
ControlPoint.BindValueChanged(point =>
if (point.NewValue != null)
{
if (point.NewValue != null)
{
bpm.Bindable = point.NewValue.BeatLengthBindable;
timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
}
});
bpm.Bindable = point.NewValue.BeatLengthBindable;
timeSignature.Bindable = point.NewValue.TimeSignatureBindable;
}
}
protected override TimingControlPoint CreatePoint()