From c73a4f8c961bbc9ee6bbb704cc2d0c85baa429a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Mon, 24 Aug 2020 13:00:19 +0200
Subject: [PATCH 1/6] Avoid override wrong text decoration

---
 .../Issue11829.cs                             | 53 +++++++++++++++++++
 ...rin.Forms.Controls.Issues.Shared.projitems |  2 +
 .../Renderers/LabelRenderer.cs                |  2 +-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
new file mode 100644
index 00000000000..d741a11388e
--- /dev/null
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
@@ -0,0 +1,53 @@
+using Xamarin.Forms.Internals;
+using Xamarin.Forms.CustomAttributes;
+
+#if UITEST
+using Xamarin.UITest;
+using NUnit.Framework;
+using Xamarin.Forms.Core.UITests;
+#endif
+
+namespace Xamarin.Forms.Controls.Issues
+{
+#if UITEST
+	[Category(UITestCategories.Label)]
+#endif
+	[Preserve(AllMembers = true)]
+	[Issue(IssueTracker.Github, 11829,
+		"[Bug] TextDecoration Strikethrough not working on iOS together with LineHeight",
+		PlatformAffected.All)]
+	public class Issue11829 : TestContentPage
+	{
+		public Issue11829()
+		{
+
+		}
+
+		protected override void Init()
+		{
+			Title = "Issue 11829";
+
+			var layout = new StackLayout();
+
+			var instructions = new Label
+			{
+				Padding = 12,
+				BackgroundColor = Color.Black,
+				TextColor = Color.White,
+				Text = "If the text below is underline, the test has passed."
+			};
+
+			var label = new Label
+			{
+				TextDecorations = TextDecorations.Underline,
+				LineHeight = 2,
+				Text = "Underline using LineHeight"
+			};
+
+			layout.Children.Add(instructions);
+			layout.Children.Add(label);
+
+			Content = layout;
+		}
+	}
+}
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 a9d464023c9..9aaa2a0ca2d 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
@@ -1827,6 +1827,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue14757.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue14897.xaml.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue14805.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11829.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">
diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
index 49a6277ebfe..c0a92f6325f 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
@@ -174,9 +174,9 @@ protected override void OnElementChanged(ElementChangedEventArgs<Label> e)
 
 				UpdateLineBreakMode();
 				UpdateText();
-				UpdateTextDecorations();
 				UpdateTextColor();
 				UpdateFont();
+				UpdateTextDecorations();
 				UpdateMaxLines();
 				UpdateCharacterSpacing();
 				UpdatePadding();

From 482f4ce0117577a4fd9f467d27faad4959d362d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Wed, 26 Aug 2020 14:22:43 +0200
Subject: [PATCH 2/6] Updated the sample to allow to modify the LineHeight
 dynamically

---
 .../Issue11829.cs                             | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
index d741a11388e..b33bdcb079e 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
@@ -41,13 +41,74 @@ protected override void Init()
 			{
 				TextDecorations = TextDecorations.Underline,
 				LineHeight = 2,
-				Text = "Underline using LineHeight"
+				Text = "Underline using LineHeight",
+				Margin = new Thickness(0, 12)
 			};
 
+			var textDecorationsLayout = new StackLayout
+			{
+				Orientation = StackOrientation.Horizontal
+			};
+
+			var textDecorationsCheckBox = new CheckBox
+			{
+				IsChecked = true,
+				VerticalOptions = LayoutOptions.Center
+			};
+
+			var textDecorationsText = new Label
+			{
+				Text = "Underline",
+				WidthRequest = 100,
+				VerticalOptions = LayoutOptions.Center
+			};
+
+			textDecorationsLayout.Children.Add(textDecorationsText);
+			textDecorationsLayout.Children.Add(textDecorationsCheckBox);
+
+			var lineHeightLayout = new StackLayout
+			{
+				Orientation = StackOrientation.Horizontal
+			};
+
+			var lineHeightSlider = new Slider
+			{
+				Maximum = 4,
+				Minimum = 2,
+				Value = 2,
+				WidthRequest = 150,
+				VerticalOptions = LayoutOptions.Center
+			};
+
+			var lineHeightText = new Label
+			{
+				Text = "LineHeight",
+				WidthRequest = 100,
+				VerticalOptions = LayoutOptions.Center
+			};
+
+			lineHeightLayout.Children.Add(lineHeightText);
+			lineHeightLayout.Children.Add(lineHeightSlider);
+
 			layout.Children.Add(instructions);
 			layout.Children.Add(label);
+			layout.Children.Add(textDecorationsLayout);
+			layout.Children.Add(lineHeightLayout);
 
 			Content = layout;
+
+			textDecorationsCheckBox.CheckedChanged += (sender, args) =>
+			{
+				if (args.Value)
+					label.TextDecorations = TextDecorations.Underline;
+				else
+					label.TextDecorations = TextDecorations.None;
+			};
+
+			lineHeightSlider.ValueChanged += (sender, args) =>
+			{
+				label.LineHeight = args.NewValue;
+			};
 		}
 	}
 }

From a6c9b349b100e81d08114ab499fd0a9aba97c7a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Wed, 26 Aug 2020 14:22:57 +0200
Subject: [PATCH 3/6] Fixed issue updating the LineHeight

---
 Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
index c0a92f6325f..b1afd074959 100644
--- a/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/Renderers/LabelRenderer.cs
@@ -219,7 +219,10 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 			else if (e.PropertyName == VisualElement.FlowDirectionProperty.PropertyName)
 				UpdateHorizontalTextAlignment();
 			else if (e.PropertyName == Label.LineHeightProperty.PropertyName)
+			{
 				UpdateText();
+				UpdateTextDecorations();
+			}
 			else if (e.PropertyName == Label.MaxLinesProperty.PropertyName)
 				UpdateMaxLines();
 			else if (e.PropertyName == Label.PaddingProperty.PropertyName)

From b76e2c7c22917cc75135a4a6bc5a558d5d7fa476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez=20Ruiz?=
 <javiersuarezruiz@hotmail.com>
Date: Mon, 21 Sep 2020 14:02:08 +0200
Subject: [PATCH 4/6] Fix build error

---
 .../Xamarin.Forms.Controls.Issues.Shared.projitems              | 2 ++
 1 file changed, 2 insertions(+)

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 9aaa2a0ca2d..7e440085dc8 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
@@ -1720,6 +1720,8 @@
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue10623.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11829.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs" >
       <DependentUpon>Issue11496.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue11209.xaml.cs">

From bee9041b81654cf32627730e09dd7097af8ddba0 Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald@verslu.is>
Date: Thu, 18 Nov 2021 20:53:26 +0100
Subject: [PATCH 5/6] Update Xamarin.Forms.Controls.Issues.Shared.projitems

---
 .../Xamarin.Forms.Controls.Issues.Shared.projitems               | 1 -
 1 file changed, 1 deletion(-)

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 7e440085dc8..06e99acf5ee 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
@@ -1719,7 +1719,6 @@
       <DependentUpon>Issue11938.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Issue10623.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs">
     <Compile Include="$(MSBuildThisFileDirectory)Issue11829.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs" >
       <DependentUpon>Issue11496.xaml</DependentUpon>

From e779da2593c0d6630cf3fc7944482a45585babdd Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald@verslu.is>
Date: Thu, 18 Nov 2021 21:18:38 +0100
Subject: [PATCH 6/6] Fix build & improve repro

---
 .../Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs      | 6 +++---
 .../Xamarin.Forms.Controls.Issues.Shared.projitems          | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
index b33bdcb079e..e5cde0f7069 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue11829.cs
@@ -34,12 +34,12 @@ protected override void Init()
 				Padding = 12,
 				BackgroundColor = Color.Black,
 				TextColor = Color.White,
-				Text = "If the text below is underline, the test has passed."
+				Text = "If the text below is underline & strike through, the test has passed."
 			};
 
 			var label = new Label
 			{
-				TextDecorations = TextDecorations.Underline,
+				TextDecorations = TextDecorations.Underline | TextDecorations.Strikethrough,
 				LineHeight = 2,
 				Text = "Underline using LineHeight",
 				Margin = new Thickness(0, 12)
@@ -100,7 +100,7 @@ protected override void Init()
 			textDecorationsCheckBox.CheckedChanged += (sender, args) =>
 			{
 				if (args.Value)
-					label.TextDecorations = TextDecorations.Underline;
+					label.TextDecorations = TextDecorations.Strikethrough | TextDecorations.Underline;
 				else
 					label.TextDecorations = TextDecorations.None;
 			};
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 06e99acf5ee..03efcb90074 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
@@ -1828,8 +1828,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Issue14757.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue14897.xaml.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Issue14805.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Issue11496.xaml.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Issue11829.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">