diff options
| author | Jimmy Garrido <jimmygarrido@outlook.com> | 2017-03-06 14:19:36 -0800 |
|---|---|---|
| committer | Samantha Houts <samantha@teamredwall.com> | 2017-03-06 14:19:36 -0800 |
| commit | 65d848051912e1522d692ba647945625f271b23c (patch) | |
| tree | ce20973c7656e2ca170299f9f163ccc430cd7b52 /Xamarin.Forms.Platform.WinRT | |
| parent | 8bc7ba3faade6e7396347f20dd8968fd35491671 (diff) | |
| download | xamarin-forms-65d848051912e1522d692ba647945625f271b23c.tar.gz xamarin-forms-65d848051912e1522d692ba647945625f271b23c.tar.bz2 xamarin-forms-65d848051912e1522d692ba647945625f271b23c.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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs index d0b5727f..9f141504 100644 --- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs @@ -170,11 +170,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; @@ -189,6 +184,11 @@ namespace Xamarin.Forms.Platform.WinRT UpdateNavigationBarBackground(); 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; |