Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-07 19:57:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting to force all instances to use rounded vs result due to Mage's quirks (#7164)

Browse Source
This commit is contained in:
Clint Rutkas
2020-10-08 08:57:17 -07:00
committed by GitHub
parent cfe2bbd75e
commit 9928579364
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/CalculateEngine.cs
View File

@@ -41,7 +41,7 @@ namespace Microsoft.Plugin.Calculator
}
var decimalResult = Convert.ToDecimal(result, cultureInfo);
var roundedResult = Math.Round(decimalResult, RoundingDigits, MidpointRounding.AwayFromZero);
var roundedResult = Round(decimalResult);
return new CalculateResult()
{
@@ -50,6 +50,11 @@ namespace Microsoft.Plugin.Calculator
};
}
public static decimal Round(decimal value)
{
return Math.Round(value, RoundingDigits, MidpointRounding.AwayFromZero);
}
private static object TransformResult(object result)
{
if (result.ToString() == "NaN")

2
src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/Main.cs
View File

@@ -44,7 +44,7 @@ namespace Microsoft.Plugin.Calculator
return new List<Result>
{
ResultHelper.CreateResult(result.Result, result.RoundedResult, IconPath),
ResultHelper.CreateResult(result.RoundedResult, IconPath),
};
} // We want to keep the process alive if any the mages library throws any exceptions.
#pragma warning disable CA1031 // Do not catch general exception types

13
src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/ResultHelper.cs
View File

@@ -14,10 +14,10 @@ namespace Microsoft.Plugin.Calculator
{
public static Result CreateResult(CalculateResult result, string iconPath)
{
return CreateResult(result.Result, result.RoundedResult, iconPath);
return CreateResult(result.RoundedResult, iconPath);
}
public static Result CreateResult(decimal result, decimal roundedResult, string iconPath)
public static Result CreateResult(decimal roundedResult, string iconPath)
{
return new Result
{
@@ -25,18 +25,19 @@ namespace Microsoft.Plugin.Calculator
IcoPath = iconPath,
Score = 300,
SubTitle = Properties.Resources.wox_plugin_calculator_copy_number_to_clipboard,
Action = c => Action(result),
Action = c => Action(roundedResult),
};
}
public static bool Action(decimal result)
public static bool Action(decimal roundedResult)
{
var ret = false;
var thread = new Thread(() =>
{
try
{
Clipboard.SetText(result.ToString(CultureInfo.CurrentUICulture.NumberFormat));
Clipboard.SetText(roundedResult.ToString(CultureInfo.CurrentUICulture.NumberFormat));
ret = true;
}
catch (ExternalException)
@@ -44,9 +45,11 @@ namespace Microsoft.Plugin.Calculator
MessageBox.Show(Properties.Resources.wox_plugin_calculator_copy_failed);
}
});
thread.SetApartmentState(ApartmentState.STA);
thread.Start();
thread.Join();
return ret;
}
}