mirror of https://github.com/ppy/osu
Fix volume adjustment precision regressing
This commit is contained in:
parent
1ddb98e409
commit
6647fcd299
|
@ -25,7 +25,7 @@ public class VolumeMeter : Container
|
||||||
private CircularProgress volumeCircle;
|
private CircularProgress volumeCircle;
|
||||||
private CircularProgress volumeCircleGlow;
|
private CircularProgress volumeCircleGlow;
|
||||||
|
|
||||||
public BindableDouble Bindable { get; } = new BindableDouble { MinValue = 0, MaxValue = 1 };
|
public BindableDouble Bindable { get; } = new BindableDouble { MinValue = 0, MaxValue = 1, Precision = 0.01 };
|
||||||
private readonly float circleSize;
|
private readonly float circleSize;
|
||||||
private readonly Color4 meterColour;
|
private readonly Color4 meterColour;
|
||||||
private readonly string name;
|
private readonly string name;
|
||||||
|
@ -222,7 +222,7 @@ public double Volume
|
||||||
private set => Bindable.Value = value;
|
private set => Bindable.Value = value;
|
||||||
}
|
}
|
||||||
|
|
||||||
private const float adjust_step = 0.05f;
|
private const double adjust_step = 0.05;
|
||||||
|
|
||||||
public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);
|
public void Increase(double amount = 1, bool isPrecise = false) => adjust(amount, isPrecise);
|
||||||
public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
|
public void Decrease(double amount = 1, bool isPrecise = false) => adjust(-amount, isPrecise);
|
||||||
|
@ -236,7 +236,7 @@ private void adjust(double delta, bool isPrecise)
|
||||||
|
|
||||||
var precision = Bindable.Precision;
|
var precision = Bindable.Precision;
|
||||||
|
|
||||||
while (Math.Abs(scrollAccumulation) > precision)
|
while (Precision.AlmostBigger(Math.Abs(scrollAccumulation), precision))
|
||||||
{
|
{
|
||||||
Volume += Math.Sign(scrollAccumulation) * precision;
|
Volume += Math.Sign(scrollAccumulation) * precision;
|
||||||
scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
|
scrollAccumulation = scrollAccumulation < 0 ? Math.Min(0, scrollAccumulation + precision) : Math.Max(0, scrollAccumulation - precision);
|
||||||
|
|
Loading…
Reference in New Issue