h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Code Issues Releases Wiki Activity

Move default declarations for readability

Browse Source
This commit is contained in:
Dean Herbert 2020-09-07 18:18:34 +09:00
parent 86512d6e8d
commit 98676af7bb
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Screens/Edit/Timing/TimingSection.cs
View File

@ -23,15 +23,8 @@ namespace osu.Game.Screens.Edit.Timing
{
Flow.AddRange(new Drawable[]
{
bpmTextEntry = new BPMTextBox
{
Bindable = new TimingControlPoint().BeatLengthBindable,
Label = "BPM",
},
bpmSlider = new BPMSlider
{
Bindable = new TimingControlPoint().BeatLengthBindable,
},
bpmTextEntry = new BPMTextBox(),
bpmSlider = new BPMSlider(),
timeSignature = new SettingsEnumDropdown<TimeSignatures>
{
LabelText = "Time Signature"
@ -62,8 +55,12 @@ namespace osu.Game.Screens.Edit.Timing
private class BPMTextBox : LabelledTextBox
{
private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
public BPMTextBox()
{
Label = "BPM";
OnCommit += (val, isNew) =>
{
if (!isNew) return;
@ -84,12 +81,10 @@ namespace osu.Game.Screens.Edit.Timing
beatLengthBindable.BindValueChanged(val =>
{
Current.Value = beatLengthToBpm(val.NewValue).ToString();
});
Current.Value = beatLengthToBpm(val.NewValue).ToString("N2");
}, true);
}
private readonly BindableDouble beatLengthBindable = new BindableDouble();
public Bindable<double> Bindable
{
get => beatLengthBindable;
@ -107,12 +102,12 @@ namespace osu.Game.Screens.Edit.Timing
private const double sane_minimum = 60;
private const double sane_maximum = 200;
private readonly BindableDouble beatLengthBindable = new BindableDouble();
private readonly BindableNumber<double> beatLengthBindable = new TimingControlPoint().BeatLengthBindable;
private readonly BindableDouble bpmBindable = new BindableDouble();
public BPMSlider()
{
beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)));
beatLengthBindable.BindValueChanged(beatLength => updateCurrent(beatLengthToBpm(beatLength.NewValue)), true);
bpmBindable.BindValueChanged(bpm => bpmBindable.Default = beatLengthBindable.Value = beatLengthToBpm(bpm.NewValue));
base.Bindable = bpmBindable;