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

Rename ResetDisplay() to ResetRadix()

Browse source
This commit is contained in:
Han Zhang 2021-08-18 17:25:10 +08:00
commit 854c87f4b1
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/CalcViewModel/StandardCalculatorViewModel.cpp
View file

@ -1188,14 +1188,14 @@ void StandardCalculatorViewModel::SetCalculatorType(ViewMode targetState)
{
case ViewMode::Standard:
IsStandard = true;
ResetDisplay();
ResetRadix();
SetPrecision(StandardModePrecision);
UpdateMaxIntDigits();
break;
case ViewMode::Scientific:
IsScientific = true;
ResetDisplay();
ResetRadix();
SetPrecision(ScientificModePrecision);
break;
@ -1226,7 +1226,7 @@ String ^ StandardCalculatorViewModel::GetLocalizedStringFormat(String ^ format,
return LocalizationStringUtil::GetLocalizedString(format, displayValue);
}
void StandardCalculatorViewModel::ResetDisplay()
void StandardCalculatorViewModel::ResetRadix()
{
AreHEXButtonsEnabled = false;
CurrentRadixType = NumberBase::DecBase;

2
src/CalcViewModel/StandardCalculatorViewModel.h
View file

@ -283,7 +283,7 @@ namespace CalculatorApp
void Recalculate(bool fromHistory = false);
bool IsOperator(CalculationManager::Command cmdenum);
void SetMemorizedNumbersString();
void ResetDisplay();
void ResetRadix();
void SetPrecision(int32_t precision);
void UpdateMaxIntDigits()

5
src/CalculatorUnitTests/StandardViewModelUnitTests.cpp
View file

@ -42,7 +42,7 @@ namespace CalculatorUnitTests
viewModel->IsStandard = true;
viewModel->IsScientific = false;
viewModel->IsProgrammer = false;
viewModel->ResetDisplay();
viewModel->ResetRadix();
viewModel->SetPrecision(StandardModePrecision);
}
else if (mode == 1)
@ -50,7 +50,7 @@ namespace CalculatorUnitTests
viewModel->IsScientific = true;
viewModel->IsProgrammer = false;
viewModel->IsStandard = false;
viewModel->ResetDisplay();
viewModel->ResetRadix();
viewModel->SetPrecision(ScientificModePrecision);
}
else if (mode == 2)
@ -58,7 +58,6 @@ namespace CalculatorUnitTests
viewModel->IsProgrammer = true;
viewModel->IsScientific = false;
viewModel->IsStandard = false;
viewModel->ResetDisplay();
viewModel->SetPrecision(ProgrammerModePrecision);
}
}