diff --git a/src/CalcViewModel/StandardCalculatorViewModel.cpp b/src/CalcViewModel/StandardCalculatorViewModel.cpp index 047356805..b84a6823a 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.cpp +++ b/src/CalcViewModel/StandardCalculatorViewModel.cpp @@ -185,12 +185,12 @@ StandardCalculatorViewModel::StandardCalculatorViewModel() AreProgrammerRadixOperatorsVisible = false; } -String ^ StandardCalculatorViewModel::LocalizeDisplayValue(_In_ wstring const& displayValue) +String ^ StandardCalculatorViewModel::LocalizeDisplayValue(_In_ wstring const& displayValue, _In_ bool isError = false) { wstring result(displayValue); // Adds leading padding 0's to Programmer Mode's Binary Display - if (IsProgrammer && CurrentRadixType == NumberBase::BinBase) + if (IsProgrammer && CurrentRadixType == NumberBase::BinBase && !isError) { result = AddPadding(result); } @@ -244,7 +244,7 @@ String ^ StandardCalculatorViewModel::GetNarratorStringReadRawNumbers(_In_ Strin void StandardCalculatorViewModel::SetPrimaryDisplay(_In_ String ^ displayStringValue, _In_ bool isError) { - String ^ localizedDisplayStringValue = LocalizeDisplayValue(displayStringValue->Data()); + String ^ localizedDisplayStringValue = LocalizeDisplayValue(displayStringValue->Data(), isError); // Set this variable before the DisplayValue is modified, Otherwise the DisplayValue will // not match what the narrator is saying diff --git a/src/CalcViewModel/StandardCalculatorViewModel.h b/src/CalcViewModel/StandardCalculatorViewModel.h index 160a7fe8c..cef586238 100644 --- a/src/CalcViewModel/StandardCalculatorViewModel.h +++ b/src/CalcViewModel/StandardCalculatorViewModel.h @@ -371,7 +371,7 @@ namespace CalculatorApp Platform::String ^ m_selectedExpressionLastData; Common::DisplayExpressionToken ^ m_selectedExpressionToken; - Platform::String ^ LocalizeDisplayValue(_In_ std::wstring const& displayValue); + Platform::String ^ LocalizeDisplayValue(_In_ std::wstring const& displayValue, _In_ bool isError); Platform::String ^ CalculateNarratorDisplayValue(_In_ std::wstring const& displayValue, _In_ Platform::String ^ localizedDisplayValue); CalculatorApp::ViewModel::Common::Automation::NarratorAnnouncement ^ GetDisplayUpdatedNarratorAnnouncement();