Skip to content

[UWP] Fix circular reference in element tag #3496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RebeccaAnne merged 1 commit into from
Sep 27, 2019
Merged

[UWP] Fix circular reference in element tag #3496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion source/uwp/Renderer/lib/ElementTagContent.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "pch.h"
#include "ElementTagContent.h"

using namespace Microsoft::WRL;
using namespace ABI::AdaptiveNamespace;
using namespace ABI::Windows::UI::Xaml;
using namespace ABI::Windows::UI::Xaml::Controls;
Expand All @@ -16,8 +17,10 @@ namespace AdaptiveNamespace
_In_ IColumnDefinition* columnDefinition,
_In_ boolean expectedVisibility)
{
ComPtr<IPanel> localParentPanel(parentPanel);
RETURN_IF_FAILED(localParentPanel.AsWeak(&m_parentPanel));

m_columnDefinition = columnDefinition;
m_parentPanel = parentPanel;
m_separator = separator;
m_cardElement = cardElement;
m_expectedVisibility = expectedVisibility;
Expand Down
2 changes: 1 addition & 1 deletion source/uwp/Renderer/lib/ElementTagContent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ namespace AdaptiveNamespace
Microsoft::WRL::ComPtr<ABI::AdaptiveNamespace::IAdaptiveCardElement> m_cardElement;
Microsoft::WRL::ComPtr<ABI::Windows::UI::Xaml::Controls::IColumnDefinition> m_columnDefinition;
Microsoft::WRL::ComPtr<ABI::Windows::UI::Xaml::IUIElement> m_separator;
Microsoft::WRL::ComPtr<ABI::Windows::UI::Xaml::Controls::IPanel> m_parentPanel;
Microsoft::WRL::WeakRef m_parentPanel;
boolean m_expectedVisibility;
};
}
5 changes: 4 additions & 1 deletion source/uwp/Renderer/lib/RenderedAdaptiveCard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,10 @@ namespace AdaptiveNamespace

for (auto parentPanel : parentPanels)
{
XamlHelpers::SetSeparatorVisibility(parentPanel);
if (parentPanel)
{
XamlHelpers::SetSeparatorVisibility(parentPanel);
}
}

return S_OK;
Expand Down