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

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

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

8
src/CalcViewModel/ApplicationViewModel.cpp
View file

@ -125,14 +125,6 @@ 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,12 +1205,6 @@ void StandardCalculatorViewModel::SetCalculatorType(ViewMode targetState)
ResetDisplay(); ResetDisplay();
SetPrecision(ProgrammerModePrecision); SetPrecision(ProgrammerModePrecision);
break; break;
default:
IsStandard = false;
IsScientific = false;
IsProgrammer = false;
ResetDisplay();
} }
} }