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

take feedback into account

Browse source
This commit is contained in:
Rudy Huyn 2019-04-03 22:13:51 -07:00
commit 752b892525
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CalcManager/CEngine/scicomm.cpp
View file

@ -632,7 +632,7 @@ void CCalcEngine::ProcessCommandWorker(WPARAM wParam)
// Set the "(=xx" indicator. // Set the "(=xx" indicator.
if (nullptr != m_pCalcDisplay) if (nullptr != m_pCalcDisplay)
{ {
m_pCalcDisplay->SetParenthesisNumber(m_openParenCount >= 0 ? (unsigned int)m_openParenCount : 0); m_pCalcDisplay->SetParenthesisNumber(m_openParenCount >= 0 ? static_cast<unsigned int>(m_openParenCount) : 0);
} }
if (!m_bError) if (!m_bError)

2
src/CalcViewModel/StandardCalculatorViewModel.cpp
View file

@ -217,7 +217,9 @@ void StandardCalculatorViewModel::DisplayPasteError()
void StandardCalculatorViewModel::SetParenthesisCount(_In_ unsigned int parenthesisCount) void StandardCalculatorViewModel::SetParenthesisCount(_In_ unsigned int parenthesisCount)
{ {
if (m_OpenParenthesisCount == parenthesisCount) if (m_OpenParenthesisCount == parenthesisCount)
{
return; return;
}
OpenParenthesisCount = parenthesisCount; OpenParenthesisCount = parenthesisCount;
if (IsProgrammer || IsScientific) if (IsProgrammer || IsScientific)

4
src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml.cpp
View file

@ -99,11 +99,11 @@ void CalculatorProgrammerRadixOperators::IsErrorVisualState::set(bool value)
} }
String^ CalculatorProgrammerRadixOperators::ParenthesisCountToString(unsigned int count) { String^ CalculatorProgrammerRadixOperators::ParenthesisCountToString(unsigned int count) {
return count == 0 ? ref new String(L"") : ref new String(to_wstring(count).data()); return (count == 0) ? ref new String() : ref new String(to_wstring(count).data());
} }
void CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators::OpenParenthesisButton_GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) void CalculatorProgrammerRadixOperators::CalculatorProgrammerRadixOperators::OpenParenthesisButton_GotFocus(Object^ sender, RoutedEventArgs^ e)
{ {
Model->SetOpenParenthesisCountNarratorAnnouncement(); Model->SetOpenParenthesisCountNarratorAnnouncement();
} }

4
src/Calculator/Views/CalculatorScientificOperators.xaml.cpp
View file

@ -99,11 +99,11 @@ void CalculatorScientificOperators::SetOperatorRowVisibility()
InvRow2->Visibility = invRowVis; InvRow2->Visibility = invRowVis;
} }
void CalculatorScientificOperators::OpenParenthesisButton_GotFocus(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) void CalculatorScientificOperators::OpenParenthesisButton_GotFocus(Object^ sender, RoutedEventArgs^ e)
{ {
Model->SetOpenParenthesisCountNarratorAnnouncement(); Model->SetOpenParenthesisCountNarratorAnnouncement();
} }
String^ CalculatorScientificOperators::ParenthesisCountToString(unsigned int count) { String^ CalculatorScientificOperators::ParenthesisCountToString(unsigned int count) {
return count == 0 ? ref new String(L"") : ref new String(to_wstring(count).data()); return (count == 0) ? ref new String() : ref new String(to_wstring(count).data());
} }