From 601ef1855c0778a6666bb7ae3876ad4fb3090ca8 Mon Sep 17 00:00:00 2001
From: Jon Robinson Levy <jon.r.levy@gmail.com>
Date: Wed, 30 Oct 2019 16:49:37 +0100
Subject: [PATCH] Fix 8222 - [UWP] Make text in Editor control top aligned
 (#8280)

* Adding test case page for Issue 8222.

* Adding top alignment to text by setting VerticalContentAlignment = Verticalalignment.Top in the internal FormsTextBox. Fixes Issue 8222.

* Removing version file added by mistake

* Removing version file added by mistake

* Removing version file added by mistake

* Removing version file added by mistake
---
 .../Issue8222.cs                                   | 47 ++++++++++++++++++++++
 .../Xamarin.Forms.Controls.Issues.Shared.projitems |  1 +
 Xamarin.Forms.Platform.UAP/EditorRenderer.cs       |  3 +-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs
new file mode 100644
index 0000000..0774405
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue8222.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Forms.CustomAttributes;
+using Xamarin.Forms.Internals;
+
+namespace Xamarin.Forms.Controls.Issues
+{
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 8222, "UWP Text in Editor is now vertically centered.", PlatformAffected.UWP)]
+	public class Issue8222 : TestContentPage
+	{
+		Editor theEditor;
+
+		public Issue8222()
+		{
+			Title = "Issue 8222";
+		}
+
+		protected override void Init()
+		{
+			Label instructions = new Label
+			{
+				Text = "Check the Editor control. Text should be aligned with the top."
+			};
+
+			theEditor = new Editor
+			{
+				HeightRequest = 100,
+			};
+
+			var stack = new StackLayout();
+
+			stack.Children.Add(instructions);
+			stack.Children.Add(theEditor);
+
+			Content = stack;
+		}
+
+		protected override void OnAppearing()
+		{
+			base.OnAppearing();
+			theEditor.Text = "This text should be top-aligned in the Editor control";
+		}
+	}
+}
+
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 628bc66..df43eeb 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@ -99,6 +99,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue7803.xaml.cs">
       <DependentUpon>Issue7803.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Issue8222.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)RefreshViewTests.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue7338.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ScrollToGroup.cs" />
diff --git a/Xamarin.Forms.Platform.UAP/EditorRenderer.cs b/Xamarin.Forms.Platform.UAP/EditorRenderer.cs
index 67a12bf..325588c 100644
--- a/Xamarin.Forms.Platform.UAP/EditorRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/EditorRenderer.cs
@@ -30,7 +30,8 @@ namespace Xamarin.Forms.Platform.UWP
 			{
 				AcceptsReturn = true,
 				TextWrapping = TextWrapping.Wrap,
-				Style = Windows.UI.Xaml.Application.Current.Resources["FormsTextBoxStyle"] as Windows.UI.Xaml.Style
+				Style = Windows.UI.Xaml.Application.Current.Resources["FormsTextBoxStyle"] as Windows.UI.Xaml.Style,
+				VerticalContentAlignment = VerticalAlignment.Top
 			};
 		}
 
-- 
2.7.4