sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Make OsuSliderBar always use number of digits from precision

Browse Source
This commit is contained in:
smoogipoo
2018-02-07 13:26:17 +09:00
parent f9cba37a65
commit 406ec6e92d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -35,6 +35,7 @@ namespace osu.Game.Graphics.UserInterface
var bindableDouble = CurrentNumber as BindableNumber<double>; var bindableDouble = CurrentNumber as BindableNumber<double>;
var bindableFloat = CurrentNumber as BindableNumber<float>; var bindableFloat = CurrentNumber as BindableNumber<float>;
var floatValue = bindableDouble?.Value ?? bindableFloat?.Value; var floatValue = bindableDouble?.Value ?? bindableFloat?.Value;
var floatPrecision = bindableDouble?.Precision ?? bindableFloat?.Precision;
if (floatValue != null) if (floatValue != null)
{ {
@ -44,7 +45,11 @@ namespace osu.Game.Graphics.UserInterface
if (floatMaxValue == 1 && (floatMinValue == 0 || floatMinValue == -1)) if (floatMaxValue == 1 && (floatMinValue == 0 || floatMinValue == -1))
return floatValue.Value.ToString("P0"); return floatValue.Value.ToString("P0");
return floatValue.Value.ToString("N1"); // We don't really care about more than 5 decimal digits
var decimalPrecision = normalize(Math.Round((decimal)floatPrecision, 5));
var precisionDigits = (decimal.GetBits(decimalPrecision)[3] >> 16) & 255;
return floatValue.Value.ToString($"N{precisionDigits}");
} }
var bindableInt = CurrentNumber as BindableNumber<int>; var bindableInt = CurrentNumber as BindableNumber<int>;
@ -52,6 +57,8 @@ namespace osu.Game.Graphics.UserInterface
return bindableInt.Value.ToString("N0"); return bindableInt.Value.ToString("N0");
return Current.Value.ToString(CultureInfo.InvariantCulture); return Current.Value.ToString(CultureInfo.InvariantCulture);
decimal normalize(decimal d) => decimal.Parse(d.ToString("0.############################", CultureInfo.InvariantCulture), CultureInfo.InvariantCulture);
} }
} }