From cc743aeeeaadfd8fa11a57b0b8070849d258d3a6 Mon Sep 17 00:00:00 2001 From: SysC0mp Date: Wed, 26 Feb 2020 20:47:14 +0100 Subject: [PATCH] Round result using new introduced setting --- Plugins/Wox.Plugin.Calculator/Main.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Plugins/Wox.Plugin.Calculator/Main.cs b/Plugins/Wox.Plugin.Calculator/Main.cs index 5d7b347d1..f2f7f7e18 100644 --- a/Plugins/Wox.Plugin.Calculator/Main.cs +++ b/Plugins/Wox.Plugin.Calculator/Main.cs @@ -63,7 +63,9 @@ namespace Wox.Plugin.Caculator if (!string.IsNullOrEmpty(result?.ToString())) { - string newResult = ChangeDecimalSeparator(result, GetDecimalSeparator()); + decimal roundedResult = Math.Round(Convert.ToDecimal(result), _settings.MaxDecimalPlaces, MidpointRounding.AwayFromZero); + string newResult = ChangeDecimalSeparator(roundedResult, GetDecimalSeparator()); + return new List { new Result @@ -118,13 +120,8 @@ namespace Wox.Plugin.Caculator return true; } - private string ChangeDecimalSeparator(object value, string newDecimalSeparator) + private string ChangeDecimalSeparator(decimal value, string newDecimalSeparator) { - if (value == null || String.IsNullOrEmpty(value.ToString())) - { - return string.Empty; - } - if (String.IsNullOrEmpty(newDecimalSeparator)) { return value.ToString(); @@ -134,7 +131,7 @@ namespace Wox.Plugin.Caculator { NumberDecimalSeparator = newDecimalSeparator }; - return Convert.ToDecimal(value).ToString(numberFormatInfo); + return value.ToString(numberFormatInfo); } private string GetDecimalSeparator()