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

Merge master into feature/GraphingCalculator branch (#585)

Browse source 
* Merge master into feature/GraphingCalculator branch
This commit is contained in:
Stephanie Anderl 2019-07-15 11:17:21 -07:00 • committed by GitHub
parent 1475b49120
commit a418777f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
447 changed files with 18056 additions and 19323 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CalcViewModel/ViewState.cpp
View file

@ -11,7 +11,7 @@ namespace CalculatorApp
Platform::StringReference Snap(L"Snap");
Platform::StringReference DockedView(L"DockedView");
bool IsValidViewState(Platform::String^ viewState)
bool IsValidViewState(Platform::String ^ viewState)
{
return viewState->Equals(ViewState::Snap) || viewState->Equals(ViewState::DockedView);
}