[GTK] Fixed label alignment when in wrapping mode

Also added unit tests for label alignment

8 files changed, 81 insertions, 0 deletions

diff --git a/Testing/Tests/LabelTests.cs b/Testing/Tests/LabelTests.cs
index 76c08552..349f7d18 100644
--- a/Testing/Tests/LabelTests.cs
+++ b/Testing/Tests/LabelTests.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 using System;
+using NUnit.Framework;
 
 namespace Xwt
 {
@@ -33,6 +34,76 @@ namespace Xwt
 		{
 			return new Label ("Hello World");
 		}
+
+		[Test]
+		public void DefaultValues ()
+		{
+			var la = new Label ();
+			Assert.AreEqual ("", la.Text);
+			Assert.AreEqual (Alignment.Start, la.TextAlignment);
+			Assert.AreEqual (EllipsizeMode.None, la.Ellipsize);
+			Assert.AreEqual (WrapMode.None, la.Wrap);
+		}
+
+		[Test]
+		public void AlignCenter ()
+		{
+			var la = new Label ("Some text here");
+			la.TextAlignment = Alignment.Center;
+			la.BackgroundColor = Xwt.Drawing.Colors.LightGray;
+			CheckWidgetRender ("Label.AlignCenter", la);
+		}
+
+		[Test]
+		public void AlignCenterWrapped ()
+		{
+			var la = new Label ("Some text here Some text here Some text here Some text here");
+			la.TextAlignment = Alignment.Center;
+			la.Wrap = WrapMode.Word;
+			la.WidthRequest = 200;
+			la.BackgroundColor = Xwt.Drawing.Colors.LightGray;
+			CheckWidgetRender ("Label.AlignCenterWrapped", la);
+		}
+
+		[Test]
+		public void AlignLeft ()
+		{
+			var la = new Label ("Some text here");
+			la.TextAlignment = Alignment.Start;
+			la.BackgroundColor = Xwt.Drawing.Colors.LightGray;
+			CheckWidgetRender ("Label.AlignLeft", la);
+		}
+
+		[Test]
+		public void AlignLeftWrapped ()
+		{
+			var la = new Label ("Some text here Some text here Some text here Some text here");
+			la.TextAlignment = Alignment.Start;
+			la.Wrap = WrapMode.Word;
+			la.WidthRequest = 200;
+			la.BackgroundColor = Xwt.Drawing.Colors.LightGray;
+			CheckWidgetRender ("Label.AlignLeftWrapped", la);
+		}
+
+		[Test]
+		public void AlignRight ()
+		{
+			var la = new Label ("Some text here");
+			la.TextAlignment = Alignment.End;
+			la.BackgroundColor = Xwt.Drawing.Colors.LightGray;
+			CheckWidgetRender ("Label.AlignRight", la);
+		}
+
+		[Test]
+		public void AlignRightWrapped ()
+		{
+			var la = new Label ("Some text here Some text here Some text here Some text here");
+			la.TextAlignment = Alignment.End;
+			la.Wrap = WrapMode.Word;
+			la.WidthRequest = 200;
+			la.BackgroundColor = Xwt.Drawing.Colors.LightGray;
+			CheckWidgetRender ("Label.AlignRightWrapped", la);
+		}
 	}
 }
 
diff --git a/Testing/Tests/ReferenceImages/Label.AlignCenter b/Testing/Tests/ReferenceImages/Label.AlignCenter
new file mode 100644
index 00000000..01b6eb60
--- /dev/null
+++ b/Testing/Tests/ReferenceImages/Label.AlignCenter
diff --git a/Testing/Tests/ReferenceImages/Label.AlignCenterWrapped b/Testing/Tests/ReferenceImages/Label.AlignCenterWrapped
new file mode 100644
index 00000000..bb5d6c78
--- /dev/null
+++ b/Testing/Tests/ReferenceImages/Label.AlignCenterWrapped
diff --git a/Testing/Tests/ReferenceImages/Label.AlignLeft b/Testing/Tests/ReferenceImages/Label.AlignLeft
new file mode 100644
index 00000000..1cf548f3
--- /dev/null
+++ b/Testing/Tests/ReferenceImages/Label.AlignLeft
diff --git a/Testing/Tests/ReferenceImages/Label.AlignLeftWrapped b/Testing/Tests/ReferenceImages/Label.AlignLeftWrapped
new file mode 100644
index 00000000..b60e96b7
--- /dev/null
+++ b/Testing/Tests/ReferenceImages/Label.AlignLeftWrapped
diff --git a/Testing/Tests/ReferenceImages/Label.AlignRight b/Testing/Tests/ReferenceImages/Label.AlignRight
new file mode 100644
index 00000000..a991200a
--- /dev/null
+++ b/Testing/Tests/ReferenceImages/Label.AlignRight
diff --git a/Testing/Tests/ReferenceImages/Label.AlignRightWrapped b/Testing/Tests/ReferenceImages/Label.AlignRightWrapped
new file mode 100644
index 00000000..b084f5ad
--- /dev/null
+++ b/Testing/Tests/ReferenceImages/Label.AlignRightWrapped
diff --git a/Testing/Tests/XwtTest.cs b/Testing/Tests/XwtTest.cs
index 3f00a44d..4f3d1369 100644
--- a/Testing/Tests/XwtTest.cs
+++ b/Testing/Tests/XwtTest.cs
@@ -68,6 +68,16 @@ namespace Xwt
 			ev.WaitForEvent ();
 			Application.MainLoop.DispatchPendingEvents ();
 		}
+
+		public void CheckWidgetRender (string refImageName, Xwt.Widget widget, int winWidth = 300, int winHeight = 100)
+		{
+			using (var win = new Window { Width = winWidth, Height = winHeight }) {
+				win.Content = widget;
+				ShowWindow (win);
+				var img = Toolkit.CurrentEngine.RenderWidget (widget);
+				ReferenceImageManager.CheckImage (refImageName, img);
+			}
+		}
 	}
 	
 	static class EventHelper