maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

This actually keeps the card alive long enough to be useful

Browse source
This commit is contained in:
Mike Griese 2021-10-13 12:47:38 -05:00
parent e38b38ab8f
commit 03caae7104
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cascadia/TerminalApp/AppActionHandlers.cpp
View file

@ -21,7 +21,7 @@ using namespace winrt::Microsoft::Terminal::Control;
using namespace winrt::Microsoft::Terminal::TerminalConnection;
using namespace ::TerminalApp;
using namespace winrt::AdaptiveCards::Rendering::Uwp;
using namespace winrt::AdaptiveCards::ObjectModel::Uwp;
// using namespace winrt::AdaptiveCards::ObjectModel::Uwp;
namespace winrt
{
@ -1159,7 +1159,7 @@ namespace winrt::TerminalApp::implementation
winrt::hstring jsonString{ advancedCard };
auto card{ AdaptiveCard::FromJsonString(jsonString) };
auto card{ winrt::AdaptiveCards::Rendering::Uwp::AdaptiveCard::FromJsonString(jsonString) };
// Alternatively:
// var card = AdaptiveCard.FromJson(jsonObject);
@ -1194,12 +1194,14 @@ namespace winrt::TerminalApp::implementation
a;
}
});
_cards.Append(renderedAdaptiveCard);
const auto fwe{ renderedAdaptiveCard.FrameworkElement() };
Windows::UI::Xaml::Controls::Grid g{};
g.HorizontalAlignment(Windows::UI::Xaml::HorizontalAlignment::Stretch);
g.VerticalAlignment(Windows::UI::Xaml::VerticalAlignment::Stretch);
g.Children().Append(renderedAdaptiveCard.FrameworkElement());
Windows::UI::Xaml::Controls::Grid g{};
g.HorizontalAlignment(Windows::UI::Xaml::HorizontalAlignment::Stretch);
g.VerticalAlignment(Windows::UI::Xaml::VerticalAlignment::Stretch);
g.Children().Append(renderedAdaptiveCard.FrameworkElement());
g.RequestedTheme(_settings.GlobalSettings().Theme());
focusedTab->SplitPane(realSplitType, splitSize, nullptr, g);

4
src/cascadia/TerminalApp/TerminalAppLib.vcxproj
View file

@ -379,7 +379,7 @@
<Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" />
<Import Project="..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets" Condition="Exists('..\..\..\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" />
<Import Project="..\..\..\packages\AdaptiveCards.Rendering.Uwp.3.0.0\build\native\AdaptiveCards.Rendering.Uwp.targets" Condition="Exists('..\..\..\packages\AdaptiveCards.Rendering.Uwp.3.0.0\build\native\AdaptiveCards.Rendering.Uwp.targets')" />
<Import Project="..\..\..\packages\AdaptiveCards.Rendering.Uwp.2.7.0\build\native\AdaptiveCards.Rendering.Uwp.targets" Condition="Exists('..\..\..\packages\AdaptiveCards.Rendering.Uwp.2.7.0\build\native\AdaptiveCards.Rendering.Uwp.targets')" />
<Import Project="..\..\..\packages\AdaptiveCards.ObjectModel.Uwp.1.0.0\build\native\AdaptiveCards.ObjectModel.Uwp.targets" Condition="Exists('..\..\..\packages\AdaptiveCards.ObjectModel.Uwp.1.0.0\build\native\AdaptiveCards.ObjectModel.Uwp.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@ -388,7 +388,7 @@
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.7.0-prerelease.210913003\build\native\Microsoft.UI.Xaml.targets'))" />
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.Toolkit.Win32.UI.XamlApplication.6.1.3\build\native\Microsoft.Toolkit.Win32.UI.XamlApplication.targets'))" />
<Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.2.3.2262\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />
<Error Condition="!Exists('$(OpenConsoleDir)\packages\AdaptiveCards.Rendering.Uwp.3.0.0\build\native\AdaptiveCards.Rendering.Uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\AdaptiveCards.Rendering.Uwp.3.0.0\build\native\AdaptiveCards.Rendering.Uwp.targets'))" />
<Error Condition="!Exists('$(OpenConsoleDir)\packages\AdaptiveCards.Rendering.Uwp.2.7.0\build\native\AdaptiveCards.Rendering.Uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\AdaptiveCards.Rendering.Uwp.2.7.0\build\native\AdaptiveCards.Rendering.Uwp.targets'))" />
<Error Condition="!Exists('$(OpenConsoleDir)\packages\AdaptiveCards.ObjectModel.Uwp.1.0.0\build\native\AdaptiveCards.ObjectModel.Uwp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\AdaptiveCards.ObjectModel.Uwp.1.0.0\build\native\AdaptiveCards.ObjectModel.Uwp.targets'))" />
</Target>
<!--

1
src/cascadia/TerminalApp/TerminalPage.cpp
View file

@ -52,6 +52,7 @@ namespace winrt::TerminalApp::implementation
TerminalPage::TerminalPage() :
_tabs{ winrt::single_threaded_observable_vector<TerminalApp::TabBase>() },
_mruTabs{ winrt::single_threaded_observable_vector<TerminalApp::TabBase>() },
_cards{ winrt::single_threaded_observable_vector<winrt::AdaptiveCards::Rendering::Uwp::RenderedAdaptiveCard>() },
_startupActions{ winrt::single_threaded_vector<ActionAndArgs>() },
_hostingHwnd{}
{

2
src/cascadia/TerminalApp/TerminalPage.h
View file

@ -161,6 +161,8 @@ namespace winrt::TerminalApp::implementation
Windows::Foundation::Collections::IObservableVector<TerminalApp::TabBase> _mruTabs;
static winrt::com_ptr<TerminalTab> _GetTerminalTabImpl(const TerminalApp::TabBase& tab);
Windows::Foundation::Collections::IObservableVector<winrt::AdaptiveCards::Rendering::Uwp::RenderedAdaptiveCard> _cards;
void _UpdateTabIndices();
TerminalApp::SettingsTab _settingsTab{ nullptr };