From adab99b2c73da8d9e0e1c6f72d55deaddb47b8d4 Mon Sep 17 00:00:00 2001 From: Samantha Houts Date: Wed, 26 Oct 2016 12:02:14 -0700 Subject: [Win] Toolbar placement works with initial value (#488) * Defer UpdateToolbarPlacement until CommandBar is in the control hierarchy * Cleanup --- Xamarin.Forms.Platform.WinRT.Phone/FormsPivot.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Xamarin.Forms.Platform.WinRT.Phone') diff --git a/Xamarin.Forms.Platform.WinRT.Phone/FormsPivot.cs b/Xamarin.Forms.Platform.WinRT.Phone/FormsPivot.cs index b06acb1f..68586abc 100644 --- a/Xamarin.Forms.Platform.WinRT.Phone/FormsPivot.cs +++ b/Xamarin.Forms.Platform.WinRT.Phone/FormsPivot.cs @@ -77,7 +77,13 @@ namespace Xamarin.Forms.Platform.WinRT #if WINDOWS_UWP _bottomCommandBarArea = GetTemplateChild("BottomCommandBarArea") as Border; _topCommandBarArea = GetTemplateChild("TopCommandBarArea") as Border; - UpdateToolbarPlacement(); + + if (_commandBar != null && _bottomCommandBarArea != null && _topCommandBarArea != null) + { + // We have to wait for the command bar to load so that it'll be in the control hierarchy + // otherwise we can't properly move it to wherever the toolbar is supposed to be + _commandBar.Loaded += (sender, args) => UpdateToolbarPlacement(); + } #endif TaskCompletionSource tcs = _commandBarTcs; -- cgit v1.2.3