Merge branch 'master' into tablet-configuration

This commit is contained in:
Dean Herbert 2021-03-19 19:06:58 +09:00 committed by GitHub
commit baf4e4e8f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions

View File

@ -19,7 +19,7 @@ namespace osu.Game.Beatmaps.ControlPoints
/// </summary> /// </summary>
public readonly BindableDouble SpeedMultiplierBindable = new BindableDouble(1) public readonly BindableDouble SpeedMultiplierBindable = new BindableDouble(1)
{ {
Precision = 0.1, Precision = 0.01,
Default = 1, Default = 1,
MinValue = 0.1, MinValue = 0.1,
MaxValue = 10 MaxValue = 10

View File

@ -18,7 +18,8 @@ namespace osu.Game.Screens.Edit.Timing
{ {
multiplierSlider = new SliderWithTextBoxInput<double>("Speed Multiplier") multiplierSlider = new SliderWithTextBoxInput<double>("Speed Multiplier")
{ {
Current = new DifficultyControlPoint().SpeedMultiplierBindable Current = new DifficultyControlPoint().SpeedMultiplierBindable,
KeyboardStep = 0.1f
} }
}); });
} }

View File

@ -69,6 +69,15 @@ namespace osu.Game.Screens.Edit.Timing
}, true); }, true);
} }
/// <summary>
/// A custom step value for each key press which actuates a change on this control.
/// </summary>
public float KeyboardStep
{
get => slider.KeyboardStep;
set => slider.KeyboardStep = value;
}
public Bindable<T> Current public Bindable<T> Current
{ {
get => slider.Current; get => slider.Current;