Merge branch 'master' into volume-meter-switch

This commit is contained in:
Derrick Timmermans
2021-07-04 17:48:26 +02:00
committed by GitHub
13 changed files with 82 additions and 21 deletions

View File

@ -193,7 +193,7 @@ namespace osu.Game.Overlays.Volume
bgProgress.Current.Value = 0.75f;
}
private int displayVolumeInt;
private int? displayVolumeInt;
private double displayVolume;
@ -202,9 +202,6 @@ namespace osu.Game.Overlays.Volume
get => displayVolume;
set
{
if (value == displayVolume)
return;
displayVolume = value;
int intValue = (int)Math.Round(displayVolume * 100);
@ -220,7 +217,7 @@ namespace osu.Game.Overlays.Volume
else
{
maxGlow.EffectColour = Color4.Transparent;
text.Text = displayVolumeInt.ToString(CultureInfo.CurrentCulture);
text.Text = intValue.ToString(CultureInfo.CurrentCulture);
}
volumeCircle.Current.Value = displayVolume * 0.75f;