diff options
| author | Jimmy Garrido <jimmygarrido@outlook.com> | 2017-03-06 14:19:36 -0800 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-03-10 14:52:17 +0000 |
| commit | 8ea3368ff91b79f8e64814f98722d5aac7412f55 (patch) | |
| tree | 02b26563e3a732577d7d873a0e864b00f296d06d /Xamarin.Forms.Platform.WinRT | |
| parent | d455bc42eaf79edb2dc0bb3b5a194fc91a98f96d (diff) | |
| download | xamarin-forms-8ea3368ff91b79f8e64814f98722d5aac7412f55.tar.gz xamarin-forms-8ea3368ff91b79f8e64814f98722d5aac7412f55.tar.bz2 xamarin-forms-8ea3368ff91b79f8e64814f98722d5aac7412f55.zip | |
[UWP] Improve toolbar consistency on MasterDetailPage (#744)
* Improve toolbar consistency on MasterDetailPage
* Properly indent xaml page
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs index 593a6747..d6f45420 100644 --- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs @@ -177,11 +177,6 @@ namespace Xamarin.Forms.Platform.WinRT Tracker = new BackgroundTracker<PageControl>(Control.BackgroundProperty) { Element = (Page)element, Container = _container }; -#if WINDOWS_UWP - // Enforce consistency rules on toolbar (show toolbar if top-level page is Navigation Page) - _container.ShouldShowToolbar = _parentMasterDetailPage == null && _parentMasterDetailPage == null; -#endif - SetPage(Element.CurrentPage, false, false); _container.Loaded += OnLoaded; @@ -194,7 +189,13 @@ namespace Xamarin.Forms.Platform.WinRT LookupRelevantParents(); UpdateTitleColor(); UpdateNavigationBarBackground(); - UpdateToolbarPlacement(); + UpdateToolbarPlacement(); + +#if WINDOWS_UWP + // Enforce consistency rules on toolbar (show toolbar if top-level page is Navigation Page) + _container.ShouldShowToolbar = _parentMasterDetailPage == null && _parentTabbedPage == null; +#endif + Element.PropertyChanged += OnElementPropertyChanged; ((INavigationPageController)Element).PushRequested += OnPushRequested; ((INavigationPageController)Element).PopRequested += OnPopRequested; |