From 3b63891526e21ed51440ac1002e4aaa20607f38e Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 19 Oct 2021 11:43:08 -0700 Subject: [PATCH 1/4] Update TeachingTip to use XamlRootChanged_revoker --- dev/TeachingTip/TeachingTip.cpp | 3 ++- dev/TeachingTip/TeachingTip.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/TeachingTip/TeachingTip.cpp b/dev/TeachingTip/TeachingTip.cpp index 3ca7355f9c..b43648c059 100644 --- a/dev/TeachingTip/TeachingTip.cpp +++ b/dev/TeachingTip/TeachingTip.cpp @@ -1164,7 +1164,8 @@ 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 diff --git a/dev/TeachingTip/TeachingTip.h b/dev/TeachingTip/TeachingTip.h index 429d4dfbaf..4dc6177561 100644 --- a/dev/TeachingTip/TeachingTip.h +++ b/dev/TeachingTip/TeachingTip.h @@ -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 m_xamlRoot{ this }; From 5288a5accf85881bd4e7355fc63d7442e46d8a64 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 19 Oct 2021 11:47:48 -0700 Subject: [PATCH 2/4] cleanup --- dev/TeachingTip/TeachingTip.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/TeachingTip/TeachingTip.cpp b/dev/TeachingTip/TeachingTip.cpp index b43648c059..ad266dea23 100644 --- a/dev/TeachingTip/TeachingTip.cpp +++ b/dev/TeachingTip/TeachingTip.cpp @@ -1164,7 +1164,6 @@ void TeachingTip::OnPopupOpened(const winrt::IInspectable&, const winrt::IInspec { m_currentXamlRootSize = xamlRoot.Size(); m_xamlRoot.set(xamlRoot); - m_xamlRootChangedRevoker = RegisterXamlRootChanged(xamlRoot, { this, &TeachingTip::XamlRootChanged }); } } From 83d061089fa4b60b8045ae315035d66daf95da42 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 19 Oct 2021 16:46:29 -0700 Subject: [PATCH 3/4] XamlRootChanged_revoker for SwipeControl --- dev/SwipeControl/SwipeControl.cpp | 3 ++- dev/SwipeControl/SwipeControl.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/SwipeControl/SwipeControl.cpp b/dev/SwipeControl/SwipeControl.cpp index 7375bdcb2c..554f8060b4 100644 --- a/dev/SwipeControl/SwipeControl.cpp +++ b/dev/SwipeControl/SwipeControl.cpp @@ -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 @@ -731,6 +731,7 @@ void SwipeControl::DetachDismissingHandlers() m_xamlRootPointerPressedEventRevoker.revoke(); m_xamlRootKeyDownEventRevoker.revoke(); + m_xamlRootChangedRevoker.revoke(); m_acceleratorKeyActivatedRevoker.revoke(); diff --git a/dev/SwipeControl/SwipeControl.h b/dev/SwipeControl/SwipeControl.h index 0ec288dce1..9ea3555656 100644 --- a/dev/SwipeControl/SwipeControl.h +++ b/dev/SwipeControl/SwipeControl.h @@ -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; From f932b1a81e44cb07473eaad2ce3f2951e3b2a7d8 Mon Sep 17 00:00:00 2001 From: kmahone Date: Tue, 19 Oct 2021 16:47:17 -0700 Subject: [PATCH 4/4] remove blank line --- dev/SwipeControl/SwipeControl.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/SwipeControl/SwipeControl.cpp b/dev/SwipeControl/SwipeControl.cpp index 554f8060b4..1337890248 100644 --- a/dev/SwipeControl/SwipeControl.cpp +++ b/dev/SwipeControl/SwipeControl.cpp @@ -731,7 +731,6 @@ void SwipeControl::DetachDismissingHandlers() m_xamlRootPointerPressedEventRevoker.revoke(); m_xamlRootKeyDownEventRevoker.revoke(); - m_xamlRootChangedRevoker.revoke(); m_acceleratorKeyActivatedRevoker.revoke();