From: Dawid Bla <46636558+DawBla@users.noreply.github.com> Date: Sun, 9 Apr 2023 01:34:27 +0000 (+0200) Subject: Hide ugly float to string conversion results from players in the mixer UI (#15183) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=00f847186f059b8bc7f4e9eb3ed8902b07b7b0c6;p=space-station-14.git Hide ugly float to string conversion results from players in the mixer UI (#15183) --- diff --git a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs index aca4835bf2..dc7a4dc903 100644 --- a/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs +++ b/Content.Client/Atmos/UI/GasMixerBoundUserInteface.cs @@ -60,7 +60,7 @@ namespace Content.Client.Atmos.UI // We don't need to send both nodes because it's just 100.0f - node float node = float.TryParse(value, out var parsed) ? parsed : 1.0f; - node = Math.Clamp(node, 0, 100); + node = Math.Clamp(node, 0f, 100.0f); if (_window is not null) node = _window.NodeOneLastEdited ? node : 100.0f - node; diff --git a/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs b/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs index 009f4d29be..f3f8293bc8 100644 --- a/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs +++ b/Content.Client/Atmos/UI/GasMixerWindow.xaml.cs @@ -75,10 +75,10 @@ namespace Content.Client.Atmos.UI public void SetNodePercentages(float nodeOne) { nodeOne *= 100.0f; - MixerNodeOneInput.Text = nodeOne.ToString(CultureInfo.InvariantCulture); + MixerNodeOneInput.Text = nodeOne.ToString("0.##", CultureInfo.InvariantCulture); float nodeTwo = 100.0f - nodeOne; - MixerNodeTwoInput.Text = nodeTwo.ToString(CultureInfo.InvariantCulture); + MixerNodeTwoInput.Text = nodeTwo.ToString("0.##", CultureInfo.InvariantCulture); } public void SetMixerStatus(bool enabled)