github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-13 00:32:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow users to paste expressions with ^or % (#682)

Browse source
This commit is contained in:
Rudy Huyn 2019-10-18 11:07:51 -07:00 • committed by Eric Wong
parent 00064fba11
commit b97046ad67
3 changed files with 66 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/CalcViewModel/StandardCalculatorViewModel.cpp
View file

@ -953,6 +953,20 @@ NumbersAndOperatorsEnum StandardCalculatorViewModel::MapCharacterToButtonId(cons
mappedValue = NumbersAndOperatorsEnum::Divide;
break;
case '^':
if (IsScientific)
{
mappedValue = NumbersAndOperatorsEnum::XPowerY;
}
break;
case '%':
if (IsScientific || IsProgrammer)
{
mappedValue = NumbersAndOperatorsEnum::Mod;
}
break;
case '=':
mappedValue = NumbersAndOperatorsEnum::Equals;
break;