From b17cb55f5710cfc14a4dbfe0182e94df47d83bd3 Mon Sep 17 00:00:00 2001 From: Paul DiPietro Date: Thu, 26 May 2016 15:14:56 -0400 Subject: [8.1/UWP] Fix PopToRootAsync functioning incorrectly (#185) When using PopToRootAsync on 8.1/UWP, the stack was being cleared but the actual page was not being set due to a missing event handler on the NavigationPageRenderer. --- Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'Xamarin.Forms.Platform.WinRT') diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs index 9fe59bad..6e8edf52 100644 --- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs @@ -157,6 +157,7 @@ namespace Xamarin.Forms.Platform.WinRT { ((INavigationPageController)oldElement).PushRequested -= OnPushRequested; ((INavigationPageController)oldElement).PopRequested -= OnPopRequested; + ((INavigationPageController)oldElement).PopToRootRequested -= OnPopToRootRequested; oldElement.InternalChildren.CollectionChanged -= OnChildrenChanged; oldElement.PropertyChanged -= OnElementPropertyChanged; } @@ -187,6 +188,7 @@ namespace Xamarin.Forms.Platform.WinRT Element.PropertyChanged += OnElementPropertyChanged; ((INavigationPageController)Element).PushRequested += OnPushRequested; ((INavigationPageController)Element).PopRequested += OnPopRequested; + ((INavigationPageController)Element).PopToRootRequested += OnPopToRootRequested; Element.InternalChildren.CollectionChanged += OnChildrenChanged; if (!string.IsNullOrEmpty(Element.AutomationId)) @@ -377,6 +379,11 @@ namespace Xamarin.Forms.Platform.WinRT SetPage(newCurrent, e.Animated, true); } + void OnPopToRootRequested(object sender, NavigationRequestedEventArgs e) + { + SetPage(e.Page, e.Animated, true); + } + void OnPushRequested(object sender, NavigationRequestedEventArgs e) { SetPage(e.Page, e.Animated, false); -- cgit v1.2.3