Fixed the baby elephant rendering using brushes (changed default Stro…

…keThickness) (#11574) fixes #11547 fixes #11497
xamarin · Jul 28, 2020 · 5ab6f1d · 5ab6f1d
1 parent 905d447
commit 5ab6f1d
Show file tree

Hide file tree

Showing 5 changed files with 83 additions and 1 deletion.
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11547.xaml b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11547.xaml
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11547.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11547.xaml.cs
@@ -0,0 +1,39 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.Xaml;
+using System.Collections.Generic;
+
+#if UITEST
+using Xamarin.UITest;
+using Xamarin.UITest.Queries;
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+#if UITEST
+	[Category(UITestCategories.Brush)]
+#endif
+#if APP
+	[XamlCompilation(XamlCompilationOptions.Compile)]
+#endif
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 11547, "[Bug] [Shapes 4.8-pre2] Justice for baby elephant!", PlatformAffected.Android | PlatformAffected.iOS)]
+	public partial class Issue11547 : TestContentPage
+	{
+		public Issue11547()
+		{
+#if APP
+			Title = "Issue 11547";
+			Device.SetFlags(new List<string> { ExperimentalFlags.ShapesExperimental });
+			InitializeComponent();
+#endif
+		}
+
+		protected override void Init()
+		{
+
+		}
+	}
+}
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
@@ -1463,6 +1463,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue11291.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11244.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11272.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11547.xaml.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11247.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -1727,6 +1728,9 @@
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue11262.xaml">
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Issue11547.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla27417Xaml.xaml">

diff --git a/Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs b/Xamarin.Forms.Core.UITests.Shared/UITestCategories.cs
@@ -66,5 +66,6 @@ internal static class UITestCategories
 		public const string RadioButton = "RadioButton";
 		public const string Accessibility = "Accessibility";
 		public const string Shape = "Shape";
+		public const string Brush = "Brush";
 	}
 }
diff --git a/Xamarin.Forms.Core/Shapes/Shape.cs b/Xamarin.Forms.Core/Shapes/Shape.cs
@@ -14,7 +14,7 @@ public Shape()
             BindableProperty.Create(nameof(Stroke), typeof(Brush), typeof(Shape), null);
 
         public static readonly BindableProperty StrokeThicknessProperty =
-            BindableProperty.Create(nameof(StrokeThickness), typeof(double), typeof(Shape), 1.0);
+            BindableProperty.Create(nameof(StrokeThickness), typeof(double), typeof(Shape), 0.0);
 
         public static readonly BindableProperty StrokeDashArrayProperty =
             BindableProperty.Create(nameof(StrokeDashArray), typeof(DoubleCollection), typeof(Shape), null,