Skip to content
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

Jump to bottom

Update TeachingTip to use XamlRootChanged_revoker #6121

Merged
merged 4 commits into from
Oct 20, 2021
Merged

Update TeachingTip to use XamlRootChanged_revoker #6121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3b63891
Update TeachingTip to use XamlRootChanged_revoker
kmahone Oct 19, 2021
5288a5a
cleanup
kmahone Oct 19, 2021
83d0610
XamlRootChanged_revoker for SwipeControl
kmahone Oct 19, 2021
f932b1a
remove blank line
kmahone Oct 19, 2021
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
2 changes: 1 addition & 1 deletion dev/SwipeControl/SwipeControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ void SwipeControl::AttachDismissingHandlers()
true /*handledEventsToo*/);
}

m_xamlRootChangedRevoker = xamlRoot.Changed(winrt::auto_revoke, { this, &SwipeControl::CurrentXamlRootChanged });
m_xamlRootChangedRevoker = RegisterXamlRootChanged(xamlRoot, { this, &SwipeControl::CurrentXamlRootChanged });
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion dev/SwipeControl/SwipeControl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ class SwipeControl :
// Used on platforms where we have XamlRoot.
RoutedEventHandler_revoker m_xamlRootPointerPressedEventRevoker{};
RoutedEventHandler_revoker m_xamlRootKeyDownEventRevoker{};
winrt::IXamlRoot::Changed_revoker m_xamlRootChangedRevoker{};
XamlRootChanged_revoker m_xamlRootChangedRevoker{};

// Used on platforms where we don't have XamlRoot.
winrt::ICoreWindow::PointerPressed_revoker m_coreWindowPointerPressedRevoker;
Expand Down
2 changes: 1 addition & 1 deletion dev/TeachingTip/TeachingTip.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,7 +1164,7 @@ void TeachingTip::OnPopupOpened(const winrt::IInspectable&, const winrt::IInspec
{
m_currentXamlRootSize = xamlRoot.Size();
m_xamlRoot.set(xamlRoot);
m_xamlRootChangedRevoker = xamlRoot.Changed(winrt::auto_revoke, { this, &TeachingTip::XamlRootChanged });
m_xamlRootChangedRevoker = RegisterXamlRootChanged(xamlRoot, { this, &TeachingTip::XamlRootChanged });
}
}
else
Expand Down
2 changes: 1 addition & 1 deletion dev/TeachingTip/TeachingTip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class TeachingTip :
winrt::Popup::Closed_revoker m_lightDismissIndicatorPopupClosedRevoker{};
winrt::CoreWindow::SizeChanged_revoker m_windowSizeChangedRevoker{};
winrt::Grid::Loaded_revoker m_tailOcclusionGridLoadedRevoker{};
winrt::XamlRoot::Changed_revoker m_xamlRootChangedRevoker{};
XamlRootChanged_revoker m_xamlRootChangedRevoker{};
// Hold a strong ref to the xamlRoot while we're open so that the changed revoker works.
// This can be removed when internal bug #21302432 is fixed.
tracker_ref<winrt::XamlRoot> m_xamlRoot{ this };
Expand Down