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

Trim the beginning of the string too

Browse source
This commit is contained in:
Rudy Huyn 2019-03-09 17:29:51 -08:00
commit 9672f6df2b
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/CalcViewModel/UnitConverterViewModel.cpp
View file

@ -53,6 +53,7 @@ constexpr size_t SELECTED_TARGET_UNIT = 2;
// x millisecond delay before we consider conversion to be final // x millisecond delay before we consider conversion to be final
constexpr unsigned int CONVERSION_FINALIZED_DELAY_IN_MS = 1000; constexpr unsigned int CONVERSION_FINALIZED_DELAY_IN_MS = 1000;
const wregex regexTrimSpacesStart = wregex(L"^\\s+");
const wregex regexTrimSpacesEnd = wregex(L"\\s+$"); const wregex regexTrimSpacesEnd = wregex(L"\\s+$");
namespace CalculatorApp::ViewModel namespace CalculatorApp::ViewModel
@ -350,9 +351,13 @@ String^ UnitConverterViewModel::ConvertToLocalizedString(const std::wstring& str
{ {
currencyResult.erase(pos, currencyCode.length()); currencyResult.erase(pos, currencyCode.length());
std::wsmatch sm; std::wsmatch sm;
if (regex_search(currencyResult, sm, regexTrimSpacesStart))
{
currencyResult.erase(sm.prefix().length(), sm.length());
}
if (regex_search(currencyResult, sm, regexTrimSpacesEnd)) if (regex_search(currencyResult, sm, regexTrimSpacesEnd))
{ {
currencyResult.erase(pos, 1);
currencyResult.erase(sm.prefix().length(), sm.length()); currencyResult.erase(sm.prefix().length(), sm.length());
} }
} }