Backport #11032 to 4.6.0 (#11040)

* [iOS] Fix BackgroundColor issue with Frame (#11032) * Fixed regression issue with Frame * Removed wrong set of BackgroundColor to null * Fix FrameRenderer background; Make Frame CornerRadius test actually count; Fix Frame BackgroundColor consistency test; * Make the radius bigger to get the shadow out of the way Co-authored-by: E.Z. Hart <[email protected]> fixes #11031 * Remove ignore attribute now that 9625 is fixed Co-authored-by: Javier Suárez <[email protected]> Co-authored-by: E.Z. Hart <[email protected]>
xamarin · Jun 14, 2020 · 1c5aec6 · 1c5aec6
1 parent 474d348
commit 1c5aec6
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 5 deletions.
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11031.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11031.cs
@@ -0,0 +1,53 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+#if UITEST
+	[Category(UITestCategories.Frame)]
+#endif
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 11031,
+		"[Bug] Regression in 4.7-pre4: Frames are broken",
+		PlatformAffected.Android)]
+	public class Issue11031 : TestContentPage
+	{
+		public Issue11031()
+		{
+		}
+
+		protected override void Init()
+		{
+			Title = "Issue 11031";
+
+			var layout = new StackLayout();
+
+			var frame = new Frame
+			{
+				BackgroundColor = Color.Red,
+				BorderColor = Color.Black,
+				CornerRadius = 24,
+				Margin = 12
+			};
+
+			var label = new Label
+			{
+				HorizontalTextAlignment = TextAlignment.Center,
+				TextColor = Color.White,
+				Text = "Issue 11031"
+			};
+
+			frame.Content = label;
+
+			layout.Children.Add(frame);
+
+			Content = layout;
+		}
+	}
+}
diff --git a/...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/...ssues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -1394,6 +1394,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue9555.xaml.cs">
       <DependentUpon>Issue9555.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11031.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">

diff --git a/Xamarin.Forms.Platform.iOS.UnitTests/BackgroundColorTests.cs b/Xamarin.Forms.Platform.iOS.UnitTests/BackgroundColorTests.cs
@@ -37,9 +37,9 @@ public async Task BackgroundColorConsistent(VisualElement element)
 		public async Task FrameBackgroundColorConsistent()
 		{
 			var frame = new Frame { BackgroundColor = Color.AliceBlue };
-			var expected = frame.BackgroundColor.ToUIColor();
-			var actual = await GetRendererProperty(frame, r => r.NativeView.BackgroundColor);
-			Assert.That(actual, Is.EqualTo(expected));
+			var expectedColor = frame.BackgroundColor.ToUIColor();
+			var screenshot = await GetRendererProperty(frame, (ver) => ver.NativeView.ToBitmap(), requiresLayout: true);
+			screenshot.AssertColorAtCenter(expectedColor);
 		}
 
 		[Test, Category("BackgroundColor"), Category("Label")]

diff --git a/Xamarin.Forms.Platform.iOS.UnitTests/CornerRadiusTests.cs b/Xamarin.Forms.Platform.iOS.UnitTests/CornerRadiusTests.cs
@@ -38,7 +38,6 @@ public async Task ButtonCornerRadius()
 		}
 
 		[Test, Category("CornerRadius"), Category("Frame")]
-		[Ignore("Will not pass until https://github.com/xamarin/Xamarin.Forms/issues/9265 is fixed")]
 		public async Task FrameCornerRadius()
 		{
 			var backgroundColor = Color.CadetBlue;
@@ -47,7 +46,7 @@ public async Task FrameCornerRadius()
 			{
 				HeightRequest = 100,
 				WidthRequest = 200,
-				CornerRadius = 15,
+				CornerRadius = 40,
 				BackgroundColor = backgroundColor,
 				BorderColor = Color.Brown,
 				Content = new Label { Text = "Hey" }

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/FrameRenderer.cs
@@ -79,7 +79,12 @@ public virtual void SetupLayer()
 			if (Element.BackgroundColor == Color.Default)
 				_actualView.Layer.BackgroundColor = ColorExtensions.BackgroundColor.CGColor;
 			else
+			{
+				// BackgroundColor gets set on the base class too which messes with
+				// the corner radius, shadow, etc. so override that behaviour here
+				BackgroundColor = UIColor.Clear;
 				_actualView.Layer.BackgroundColor = Element.BackgroundColor.ToCGColor();
+			}
 
 			if (Element.BorderColor == Color.Default)
 				_actualView.Layer.BorderColor = UIColor.Clear.CGColor;