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

Changed output of GetCurrentRadix to match the variable type of m_radix

Browse source
This commit is contained in:
PokeCodec 2020-10-28 14:21:41 -04:00
commit d717c10e4b
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1045,7 +1045,7 @@ bool CCalcEngine::IsCurrentTooBigForTrig()
return m_currentVal >= m_maxTrigonometricNum;
}
int CCalcEngine::GetCurrentRadix()
uint32_t CCalcEngine::GetCurrentRadix()
{
return m_radix;
}

2
src/CalcManager/CalculatorManager.cpp
View file

@ -534,7 +534,7 @@ namespace CalculationManager
vector<wstring> resultVector;
for (auto const& memoryItem : m_memorizedNumbers)
{
int radix = m_currentCalculatorEngine->GetCurrentRadix();
auto radix = m_currentCalculatorEngine->GetCurrentRadix();
wstring stringValue = m_currentCalculatorEngine->GetStringForDisplay(memoryItem, radix);
if (!stringValue.empty())

2
src/CalcManager/Header Files/CalcEngine.h
View file

@ -77,7 +77,7 @@ public:
}
void SettingsChanged();
bool IsCurrentTooBigForTrig();
int GetCurrentRadix();
uint32_t GetCurrentRadix();
std::wstring GetCurrentResultForRadix(uint32_t radix, int32_t precision, bool groupDigitsPerRadix);
void ChangePrecision(int32_t precision)
{