From 746a199f5d12983b5be8f1a4433cd66c0e777476 Mon Sep 17 00:00:00 2001 From: Lee-WonJun Date: Fri, 7 Aug 2020 12:05:48 +0900 Subject: [PATCH] Revert "Reset Calculator Type in Calculator ViewModel when mode change to not Calculator mode" This reverts commit a0d2f84513bc2d36fea3d75445782e1c67bc2e8d. --- src/CalcViewModel/ApplicationViewModel.cpp | 8 -------- src/CalcViewModel/StandardCalculatorViewModel.cpp | 6 ------ 2 files changed, 14 deletions(-) diff --git a/src/CalcViewModel/ApplicationViewModel.cpp b/src/CalcViewModel/ApplicationViewModel.cpp index 1f14a55c..ee5f2fbb 100644 --- a/src/CalcViewModel/ApplicationViewModel.cpp +++ b/src/CalcViewModel/ApplicationViewModel.cpp @@ -125,14 +125,6 @@ bool ApplicationViewModel::TryRecoverFromNavigationModeFailure() void ApplicationViewModel::OnModeChanged() { 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 (!m_CalculatorViewModel) diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index dd3bfef6..a148fe31 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -1205,12 +1205,6 @@ void StandardCalculatorViewModel::SetCalculatorType(ViewMode targetState) ResetDisplay(); SetPrecision(ProgrammerModePrecision); break; - - default: - IsStandard = false; - IsScientific = false; - IsProgrammer = false; - ResetDisplay(); } }