diff options
| author | Samantha Houts <samantha@teamredwall.com> | 2016-10-26 12:02:14 -0700 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2016-10-26 20:02:14 +0100 |
| commit | fc74c65e8ec5e733e6e24a4db968dee430c01f73 (patch) | |
| tree | e66d2079c20e7c8dfade4086806d3e37abdd20cf /Xamarin.Forms.Platform.WinRT | |
| parent | a0fb20a075e89ddb8763faa1306f07041ea3d4fe (diff) | |
| download | xamarin-forms-fc74c65e8ec5e733e6e24a4db968dee430c01f73.tar.gz xamarin-forms-fc74c65e8ec5e733e6e24a4db968dee430c01f73.tar.bz2 xamarin-forms-fc74c65e8ec5e733e6e24a4db968dee430c01f73.zip | |
[Win] Toolbar placement works with initial value (#488)
* Defer UpdateToolbarPlacement until CommandBar is in the control hierarchy
* Cleanup
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs b/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs index 7be51c05..a57b6749 100644 --- a/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs +++ b/Xamarin.Forms.Platform.WinRT/PageControl.xaml.cs @@ -150,7 +150,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<CommandBar> tcs = _commandBarTcs; |