[iOS] Fix reapply of safe insets (xamarin#2719) fixes xamarin#1584

sttassociates · May 28, 2018 · 4bf2ffe · 4bf2ffe
1 parent 4df442f
commit 4bf2ffe
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/Xamarin.Forms.Core/PlatformConfiguration/iOSSpecific/Page.cs b/Xamarin.Forms.Core/PlatformConfiguration/iOSSpecific/Page.cs
@@ -43,7 +43,7 @@ public static void SetPreferredStatusBarUpdateAnimation(BindableObject element,
 				element.SetValue(PreferredStatusBarUpdateAnimationProperty, value);
 			else if (value == UIStatusBarAnimation.Slide)
 				element.SetValue(PreferredStatusBarUpdateAnimationProperty, value);
-			else 
+			else
 				element.SetValue(PreferredStatusBarUpdateAnimationProperty, value);
 		}
 
@@ -65,6 +65,10 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetPreferredStatu
 			{
 				page.Padding = default(Thickness);
 			}
+			else
+			{
+				UpdatePadding(GetSafeAreaInsets(page), page);
+			}
 		});
 
 		public static bool GetUseSafeArea(BindableObject element)
@@ -114,12 +118,15 @@ public static IPlatformElementConfiguration<iOS, FormsElement> SetLargeTitleDisp
 		static readonly BindablePropertyKey SafeAreaInsetsPropertyKey = BindableProperty.CreateReadOnly(nameof(SafeAreaInsets), typeof(Thickness), typeof(Page), default(Thickness), propertyChanged: (bindable, oldValue, newValue) =>
 		{
 			var page = bindable as Xamarin.Forms.Page;
-			if (page.On<iOS>().UsingSafeArea())
-			{
-				page.Padding = (Thickness)newValue;
-			}
+			UpdatePadding((Thickness)newValue, page);
 		});
 
+		static void UpdatePadding(Thickness thickness, FormsElement page)
+		{
+			if (page.On<iOS>().UsingSafeArea())
+				page.Padding = thickness;
+		}
+
 		public static readonly BindableProperty SafeAreaInsetsProperty = SafeAreaInsetsPropertyKey.BindableProperty;
 
 		public static Thickness GetSafeAreaInsets(BindableObject element)