From 8dd51f2b49799bf7c0e51efe1d339dec44d91220 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 16 Jun 2016 17:31:50 +0100 Subject: [WinRT] Add base platform as inner proxy navigation to Application, Fix back button issue (#214) * [WinRT] Add base platform as inner proxy navigation to Application * [UWP] Remove back button when NavigationPage is disposed --- Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs | 7 +++++++ Xamarin.Forms.Platform.WinRT/Platform.cs | 1 + 2 files changed, 8 insertions(+) (limited to 'Xamarin.Forms.Platform.WinRT') diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs index b5bf4876..df0c023d 100644 --- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs @@ -222,6 +222,13 @@ namespace Xamarin.Forms.Platform.WinRT if (_parentMasterDetailPage != null) _parentMasterDetailPage.PropertyChanged -= MultiPagePropertyChanged; + +#if WINDOWS_UWP + if (_navManager != null) + { + _navManager.AppViewBackButtonVisibility = AppViewBackButtonVisibility.Collapsed; + } +#endif } protected void OnElementChanged(VisualElementChangedEventArgs e) diff --git a/Xamarin.Forms.Platform.WinRT/Platform.cs b/Xamarin.Forms.Platform.WinRT/Platform.cs index 311186b2..268806ad 100644 --- a/Xamarin.Forms.Platform.WinRT/Platform.cs +++ b/Xamarin.Forms.Platform.WinRT/Platform.cs @@ -99,6 +99,7 @@ namespace Xamarin.Forms.Platform.WinRT _navModel.Push(newRoot, null); newRoot.NavigationProxy.Inner = this; SetCurrent(newRoot, false, true); + ((Application)newRoot.RealParent).NavigationProxy.Inner = this; } public IReadOnlyList NavigationStack -- cgit v1.2.3