Rebase and Clean Up (#8107)

Author: bmacombe

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6476.cs

@@ -0,0 +1,19 @@
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 6474, "Border and CornerRadius are not respected in UWP when button is disabled", PlatformAffected.UWP)]
+	public class Issue6474 : TestContentPage
+	{
+		protected override void Init()
+		{
+			var stackLayout = new StackLayout() { Margin = 25 };
+			stackLayout.Children.Add(new Label { Text = "Visually verify that all buttons have a corner radius and that no background color extends beyond the border." });
+			stackLayout.Children.Add(new Button { CornerRadius = 10, BorderColor = Color.Red, Text = "Enabled" });
+			stackLayout.Children.Add(new Button { CornerRadius = 10, BorderColor = Color.Red, Text = "Disabled", IsEnabled = false });
+			Content = stackLayout;
+		}
+	}
+}

Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems

@@ -20,12 +20,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)CollectionViewHeaderFooterView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)CollectionViewItemsUpdatingScrollMode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue3475.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue6476.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue7825.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue5354.xaml.cs">
       <SubType>Code</SubType>
-    </Compile> 
-    <Compile Include="$(MSBuildThisFileDirectory)Issue5868.cs" /> 
-    <Compile Include="$(MSBuildThisFileDirectory)Issue6963.cs" /> 
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Issue5868.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue6963.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue7253.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue7581.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue7621.xaml.cs">
@@ -1591,4 +1592,4 @@
       <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
     </EmbeddedResource>
   </ItemGroup>
-</Project>
+</Project>

Xamarin.Forms.Platform.UAP/FormsButton.cs

@@ -16,6 +16,7 @@ public class FormsButton : Windows.UI.Xaml.Controls.Button
 			new PropertyMetadata(default(Brush), OnBackgroundColorChanged));
 
 		WContentPresenter _contentPresenter;
+		Windows.UI.Xaml.Controls.Grid _rootGrid;
 
 		public Brush BackgroundColor
 		{
@@ -46,6 +47,7 @@ protected override void OnApplyTemplate()
 			base.OnApplyTemplate();
 
 			_contentPresenter = GetTemplateChild("ContentPresenter") as WContentPresenter;
+			_rootGrid = GetTemplateChild("RootGrid") as Windows.UI.Xaml.Controls.Grid;
 
 			UpdateBackgroundColor();
 			UpdateBorderRadius();
@@ -73,11 +75,13 @@ void UpdateBackgroundColor()
 
 		void UpdateBorderRadius()
 		{
-			if (_contentPresenter != null)
-			{
-				var radius = BorderRadius == -1 ? 0 : BorderRadius;
-				_contentPresenter.CornerRadius = new Windows.UI.Xaml.CornerRadius(radius);
-			}
+			var radius = BorderRadius == -1 ? 0 : BorderRadius;
+			var cornerRadius = new Windows.UI.Xaml.CornerRadius(radius);
+			if (_contentPresenter != null)						
+				_contentPresenter.CornerRadius = cornerRadius;				
+			
+			if(_rootGrid != null)
+				_rootGrid.CornerRadius = cornerRadius;
 		}
 
 		public void UpdateCharacterSpacing(int characterSpacing)