From c3ee01dc3e6d4267f329151fba69f57937fc9743 Mon Sep 17 00:00:00 2001
From: Charlie Kindel <charlie@kindel.com>
Date: Fri, 22 May 2020 18:15:33 -0600
Subject: [PATCH] Fixed label and updated TextAlignment scenario

---
 Terminal.Gui/Views/Label.cs          |  2 +-
 UICatalog/Scenarios/TextAlignment.cs | 31 +++++++++++++++++-----------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Terminal.Gui/Views/Label.cs b/Terminal.Gui/Views/Label.cs
index b265fccda..3f5fb448b 100644
--- a/Terminal.Gui/Views/Label.cs
+++ b/Terminal.Gui/Views/Label.cs
@@ -179,7 +179,7 @@ namespace Terminal.Gui {
 				int x;
 				switch (textAlignment) {
 				case TextAlignment.Left:
-					x = Frame.Left;
+					x = 0;
 					break;
 				case TextAlignment.Justified:
 					Recalc ();
diff --git a/UICatalog/Scenarios/TextAlignment.cs b/UICatalog/Scenarios/TextAlignment.cs
index 0a8d0f8d0..1f4beb019 100644
--- a/UICatalog/Scenarios/TextAlignment.cs
+++ b/UICatalog/Scenarios/TextAlignment.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using Terminal.Gui;
 
@@ -9,18 +10,24 @@ namespace UICatalog {
 		public override void Setup ()
 		{
 			int i = 1;
-			string txt = "Hello world, how are you doing today";
-			var labelList = new List<Label> ();
-			labelList.Add (new Label ($"Label:"));
-			labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Left, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
-			labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Right, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
-			labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Centered, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
-			labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Justified, Width = Dim.Fill (1), X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
-			txt += "\nSecond line";
-			labelList.Add (new Label ($"{i++}-{txt}") { TextAlignment = Terminal.Gui.TextAlignment.Left, Width = Dim.Fill (1), Height = 4, X = 0, Y = Pos.Bottom (labelList.LastOrDefault ()) + 1 });
+			string txt = "Hello world, how are you doing today?";
 
-			Win.Add (labelList.ToArray ());
-			Win.LayoutSubviews ();
+			var alignments = Enum.GetValues (typeof (Terminal.Gui.TextAlignment)).Cast<Terminal.Gui.TextAlignment> ().ToList();
+
+			foreach (var alignment in alignments) {
+				Win.Add (new Label ($"{alignment}:") { Y = ++i });
+				Win.Add (new Label (txt) { TextAlignment = alignment, Y = i++, Width = Dim.Fill(), ColorScheme = Colors.Dialog });
+			}
+
+			// Demonstrate that wrapping labels are not yet implemented (#352)
+			txt += "\nSecond line";
+			Win.Add (new Label ($"Demonstrating multi-line (note wrap is not yet implemented):") { Y = ++i });
+
+			foreach (var alignment in alignments) {
+				Win.Add (new Label ($"{alignment}:") { Y = ++i });
+				Win.Add (new Label (txt) { TextAlignment = alignment, Y = ++i, Width = Dim.Fill (), Height = 2, ColorScheme = Colors.Dialog });
+				i += 2;
+			}
 		}
 	}
 }
\ No newline at end of file