summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.UAP
diff options
context:
space:
mode:
authorPaul DiPietro <pauldipietro@users.noreply.github.com>2017-03-03 06:51:28 -0600
committerRui Marinho <me@ruimarinho.net>2017-03-03 12:51:28 +0000
commitb53ccf0d474f4c4d4a2679a8c7ab6c793cc2458d (patch)
treee24870a94b0bd9fce33f52dc84627ac6ceb14c38 /Xamarin.Forms.Platform.UAP
parentbc13d3cfeeea62214f0c6f434e5f21f7117e2e1a (diff)
downloadxamarin-forms-b53ccf0d474f4c4d4a2679a8c7ab6c793cc2458d.tar.gz
xamarin-forms-b53ccf0d474f4c4d4a2679a8c7ab6c793cc2458d.tar.bz2
xamarin-forms-b53ccf0d474f4c4d4a2679a8c7ab6c793cc2458d.zip
[WinRT/UWP] Do not allow IsPresented use in Split mode on desktop (#707)
Diffstat (limited to 'Xamarin.Forms.Platform.UAP')
-rw-r--r--Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs b/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
index 4a7fe033..b2b0d8b3 100644
--- a/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/MasterDetailPageRenderer.cs
@@ -163,7 +163,7 @@ namespace Xamarin.Forms.Platform.UWP
protected virtual void OnElementPropertyChanged(object sender, PropertyChangedEventArgs e)
{
- if (e.PropertyName == MasterDetailPage.IsPresentedProperty.PropertyName)
+ if (e.PropertyName == MasterDetailPage.IsPresentedProperty.PropertyName || e.PropertyName == MasterDetailPage.MasterBehaviorProperty.PropertyName)
UpdateIsPresented();
else if (e.PropertyName == "Master")
UpdateMaster();
@@ -286,6 +286,11 @@ namespace Xamarin.Forms.Platform.UWP
void UpdateIsPresented()
{
+ // Ignore the IsPresented value being set to false for Split mode on desktop and allow the master
+ // view to be made initially visible
+ if (Device.Idiom == TargetIdiom.Desktop && Control.IsPaneOpen && Element.MasterBehavior != MasterBehavior.Popover)
+ return;
+
Control.IsPaneOpen = Element.IsPresented;
}