Skip to content

Commit cc743ae

Browse files
committed
Round result using new introduced setting
1 parent 0933eab commit cc743ae

File tree

1 file changed

+5
-8
lines changed
  • Plugins/Wox.Plugin.Calculator

1 file changed

+5
-8
lines changed

Plugins/Wox.Plugin.Calculator/Main.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ public List<Result> Query(Query query)
6363

6464
if (!string.IsNullOrEmpty(result?.ToString()))
6565
{
66-
string newResult = ChangeDecimalSeparator(result, GetDecimalSeparator());
66+
decimal roundedResult = Math.Round(Convert.ToDecimal(result), _settings.MaxDecimalPlaces, MidpointRounding.AwayFromZero);
67+
string newResult = ChangeDecimalSeparator(roundedResult, GetDecimalSeparator());
68+
6769
return new List<Result>
6870
{
6971
new Result
@@ -118,13 +120,8 @@ private bool CanCalculate(Query query)
118120
return true;
119121
}
120122

121-
private string ChangeDecimalSeparator(object value, string newDecimalSeparator)
123+
private string ChangeDecimalSeparator(decimal value, string newDecimalSeparator)
122124
{
123-
if (value == null || String.IsNullOrEmpty(value.ToString()))
124-
{
125-
return string.Empty;
126-
}
127-
128125
if (String.IsNullOrEmpty(newDecimalSeparator))
129126
{
130127
return value.ToString();
@@ -134,7 +131,7 @@ private string ChangeDecimalSeparator(object value, string newDecimalSeparator)
134131
{
135132
NumberDecimalSeparator = newDecimalSeparator
136133
};
137-
return Convert.ToDecimal(value).ToString(numberFormatInfo);
134+
return value.ToString(numberFormatInfo);
138135
}
139136

140137
private string GetDecimalSeparator()

0 commit comments

Comments
 (0)