microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-11 13:56:33 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

Replicate winrt::make<> changes in ScratchIslandApp SampleAppLib (#10494)

Browse Source 
Sample scratch app would not compile. It does if we apply #10335 to App.base.h in the scratch app.

Closes #10493
This commit is contained in:
Breece W 2021-06-22 23:21:07 -04:00 committed by GitHub
parent e3b7a44b13
commit 848e353b9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scratch/ScratchIslandApp/SampleApp/App.base.h
View File

@ -9,30 +9,22 @@ namespace winrt::SampleApp::implementation
IXamlType GetXamlType(::winrt::Windows::UI::Xaml::Interop::TypeName const& type) IXamlType GetXamlType(::winrt::Windows::UI::Xaml::Interop::TypeName const& type)
{ {
return AppProvider()->GetXamlType(type); return _appProvider.GetXamlType(type);
} }
IXamlType GetXamlType(::winrt::hstring const& fullName) IXamlType GetXamlType(::winrt::hstring const& fullName)
{ {
return AppProvider()->GetXamlType(fullName); return _appProvider.GetXamlType(fullName);
} }
::winrt::com_array<::winrt::Windows::UI::Xaml::Markup::XmlnsDefinition> GetXmlnsDefinitions() ::winrt::com_array<::winrt::Windows::UI::Xaml::Markup::XmlnsDefinition> GetXmlnsDefinitions()
{ {
return AppProvider()->GetXmlnsDefinitions(); return _appProvider.GetXmlnsDefinitions();
} }
private: private:
bool _contentLoaded{ false }; bool _contentLoaded{ false };
std::shared_ptr<XamlMetaDataProvider> _appProvider; winrt::SampleApp::XamlMetaDataProvider _appProvider;
std::shared_ptr<XamlMetaDataProvider> AppProvider()
{
if (!_appProvider)
{
_appProvider = std::make_shared<XamlMetaDataProvider>();
}
return _appProvider;
}
}; };
template<typename D, typename... I> template<typename D, typename... I>