diff options
| author | E.Z. Hart <hartez@users.noreply.github.com> | 2017-01-03 04:25:24 -0700 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-01-03 11:25:24 +0000 |
| commit | 8c5fd096945301a2db0d85baf77ce46812a8d89f (patch) | |
| tree | 348002d9c1c24520231510abf4b0fb77458eda24 /Xamarin.Forms.Platform.WinRT | |
| parent | ee608ba46642f735d723ac1d00b7f87298b949f6 (diff) | |
| download | xamarin-forms-8c5fd096945301a2db0d85baf77ce46812a8d89f.tar.gz xamarin-forms-8c5fd096945301a2db0d85baf77ce46812a8d89f.tar.bz2 xamarin-forms-8c5fd096945301a2db0d85baf77ce46812a8d89f.zip | |
Make UWP toolbar display rules consistent with other platforms (#638)
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs | 7 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs index 5d6b2126..593a6747 100644 --- a/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/NavigationPageRenderer.cs @@ -177,6 +177,11 @@ 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; @@ -304,6 +309,8 @@ namespace Xamarin.Forms.Platform.WinRT _parentMasterDetailPage.PropertyChanged += MultiPagePropertyChanged; #if WINDOWS_UWP ((ITitleProvider)this).ShowTitle = _parentTabbedPage == null && _parentMasterDetailPage == null; + + #else if (Device.Idiom == TargetIdiom.Phone && _parentTabbedPage != null) ((ITitleProvider)this).ShowTitle = false; diff --git a/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs b/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs index 8d00371f..4d58c56d 100644 --- a/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs +++ b/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs @@ -42,6 +42,12 @@ namespace Xamarin.Forms.Platform.WinRT #if WINDOWS_UWP ToolbarPlacement _toolbarPlacement; readonly ToolbarPlacementHelper _toolbarPlacementHelper = new ToolbarPlacementHelper(); + + public bool ShouldShowToolbar + { + get { return _toolbarPlacementHelper.ShouldShowToolBar; } + set { _toolbarPlacementHelper.ShouldShowToolBar = value; } + } #endif TaskCompletionSource<CommandBar> _commandBarTcs; |