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

Revert "Replace wstring used in public methods by Platform::String in CalcViewModel (#758)" (#767)

Browse source 
This reverts commit 93f1f784bb.
This commit is contained in:
Rudy Huyn 2019-11-04 17:54:12 -08:00 • committed by Matt Cooley
commit 049d3f4c6c
35 changed files with 533 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Calculator/Views/MainPage.xaml.cpp
View file

@ -10,7 +10,6 @@
#include "CalcViewModel/Common/AppResourceProvider.h"
#include "Views/Memory.xaml.h"
#include "Converters/BooleanToVisibilityConverter.h"
#include "CalcViewModel/Common/LocalizationStringUtil.h"
#include "Common/AppLifecycleLogger.h"
using namespace CalculatorApp;
using namespace CalculatorApp::Common;
@ -511,20 +510,25 @@ void MainPage::SetHeaderAutomationName()
String ^ name;
if (NavCategory::IsDateCalculatorViewMode(mode))
{
name = resProvider->GetResourceString(L"HeaderAutomationName_Date");
name = resProvider.GetResourceString(L"HeaderAutomationName_Date");
}
else
{
String ^ full;
wstring full;
if (NavCategory::IsCalculatorViewMode(mode))
{
full = resProvider->GetResourceString(L"HeaderAutomationName_Calculator");
full = resProvider.GetResourceString(L"HeaderAutomationName_Calculator")->Data();
}
else if (NavCategory::IsConverterViewMode(mode))
{
full = resProvider->GetResourceString(L"HeaderAutomationName_Converter");
full = resProvider.GetResourceString(L"HeaderAutomationName_Converter")->Data();
}
name = LocalizationStringUtil::GetLocalizedString(full, m_model->CategoryName);
string::size_type found = full.find(L"%1");
wstring strMode = m_model->CategoryName->Data();
full = full.replace(found, 2, strMode);
name = ref new String(full.c_str());
}
AutomationProperties::SetName(Header, name);