diff options
author | Rui Marinho <me@ruimarinho.net> | 2016-06-16 17:31:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-16 17:31:50 +0100 |
commit | 8dd51f2b49799bf7c0e51efe1d339dec44d91220 (patch) | |
tree | fec3753cec09eac6ac24b4a0a5944017ebaea8a6 /Xamarin.Forms.Platform.WinRT | |
parent | 87f1418d2ffe1913a0b1c312119d839a5bb234ba (diff) | |
download | xamarin-forms-8dd51f2b49799bf7c0e51efe1d339dec44d91220.tar.gz xamarin-forms-8dd51f2b49799bf7c0e51efe1d339dec44d91220.tar.bz2 xamarin-forms-8dd51f2b49799bf7c0e51efe1d339dec44d91220.zip |
[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
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
-rw-r--r-- | Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs | 7 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.WinRT/Platform.cs | 1 |
2 files changed, 8 insertions, 0 deletions
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<Page> NavigationStack |