github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-07-06 21:21:09 -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

12
src/CalcViewModel/ApplicationViewModel.cpp
View file

@ -36,7 +36,6 @@ namespace
{
StringReference CategoriesPropertyName(L"Categories");
StringReference ClearMemoryVisibilityPropertyName(L"ClearMemoryVisibility");
StringReference AppBarVisibilityPropertyName(L"AppBarVisibility");
}
ApplicationViewModel::ApplicationViewModel() :
@ -62,7 +61,7 @@ void ApplicationViewModel::Mode::set(ViewMode value)
}
}
void ApplicationViewModel::Categories::set(IObservableVector<NavCategoryGroup^>^ value)
void ApplicationViewModel::Categories::set(IObservableVector<NavCategoryGroup ^> ^ value)
{
if (m_categories != value)
{
@ -92,7 +91,7 @@ void ApplicationViewModel::Initialize(ViewMode mode)
throw;
}
}
catch (Exception^ e)
catch (Exception ^ e)
{
TraceLogger::GetInstance().LogPlatformException(__FUNCTIONW__, e);
if (!TryRecoverFromNavigationModeFailure())
@ -172,10 +171,9 @@ void ApplicationViewModel::OnModeChanged()
TraceLogger::GetInstance().LogModeChangeEnd(m_mode, ApplicationView::GetApplicationViewIdForWindow(CoreWindow::GetForCurrentThread()));
RaisePropertyChanged(ClearMemoryVisibilityPropertyName);
RaisePropertyChanged(AppBarVisibilityPropertyName);
}
void ApplicationViewModel::OnCopyCommand(Object^ parameter)
void ApplicationViewModel::OnCopyCommand(Object ^ parameter)
{
if (NavCategory::IsConverterViewMode(m_mode))
{
@ -191,13 +189,13 @@ void ApplicationViewModel::OnCopyCommand(Object^ parameter)
}
}
void ApplicationViewModel::OnPasteCommand(Object^ parameter)
void ApplicationViewModel::OnPasteCommand(Object ^ parameter)
{
if (NavCategory::IsConverterViewMode(m_mode))
{
ConverterViewModel->OnPasteCommand(parameter);
}
else
else if (NavCategory::IsCalculatorViewMode(m_mode))
{
CalculatorViewModel->OnPasteCommand(parameter);
}