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

Reset Calculator Type in Calculator ViewModel when mode change to not Calculator mode

Browse source
This commit is contained in:
Lee-WonJun 2020-08-05 22:07:53 +09:00
commit a0d2f84513
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/CalcViewModel/ApplicationViewModel.cpp
View file

@ -125,6 +125,14 @@ bool ApplicationViewModel::TryRecoverFromNavigationModeFailure()
void ApplicationViewModel::OnModeChanged() void ApplicationViewModel::OnModeChanged()
{ {
assert(NavCategory::IsValidViewMode(m_mode)); assert(NavCategory::IsValidViewMode(m_mode));
if (NavCategory::IsValidViewMode(m_PreviousMode) && NavCategory::IsCalculatorViewMode(m_PreviousMode) && !NavCategory::IsCalculatorViewMode(m_mode))
{
if (m_CalculatorViewModel)
{
m_CalculatorViewModel->SetCalculatorType(m_mode);
}
}
if (NavCategory::IsCalculatorViewMode(m_mode)) if (NavCategory::IsCalculatorViewMode(m_mode))
{ {
if (!m_CalculatorViewModel) if (!m_CalculatorViewModel)

6
src/CalcViewModel/StandardCalculatorViewModel.cpp
View file

@ -1205,6 +1205,12 @@ void StandardCalculatorViewModel::SetCalculatorType(ViewMode targetState)
ResetDisplay(); ResetDisplay();
SetPrecision(ProgrammerModePrecision); SetPrecision(ProgrammerModePrecision);
break; break;
default:
IsStandard = false;
IsScientific = false;
IsProgrammer = false;
ResetDisplay();
} }
} }