From ed620f42c980270a69ebc346bdc40b79861c057c Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Mon, 8 Feb 2016 17:26:51 +0100
Subject: [PATCH] Simplify Alignment Enum; add HorizontalStretch and
 VerticalStretch to GraphicObject

---
 Templates/Spinner.goml               |   2 +-
 Tests/Interfaces/0.crow              |   6 +-
 Tests/Interfaces/2.crow              |   4 +-
 Tests/Interfaces/4.crow              | 146 +++++++++++++--------------
 Tests/Interfaces/fps.goml            |   8 +-
 Tests/Interfaces/test4.1.goml        |   6 +-
 Tests/Interfaces/test4.goml          |   2 +-
 Tests/Interfaces/testExpandable.goml |   2 +-
 Tests/Interfaces/testPopper.goml     |   2 +-
 Tests/Interfaces/testTextBox.crow    |  22 ++--
 Tests/Interfaces/testWindow.goml     |  16 +--
 src/Enums.cs                         |  26 +----
 src/GraphicObjects/Label.cs          | 109 +++++++++-----------
 src/GraphicObjects/TextRun.cs        | 103 ++++++++-----------
 14 files changed, 202 insertions(+), 252 deletions(-)

diff --git a/Templates/Spinner.goml b/Templates/Spinner.goml
index b8330fcd..bd202c1a 100755
--- a/Templates/Spinner.goml
+++ b/Templates/Spinner.goml
@@ -4,7 +4,7 @@
 	Background="White">
 	<HorizontalStack Name="hstack" Margin="0" Spacing="2" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
 		<Label Foreground="DimGray" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
-			Text="{../../../Value}" Margin="1" TextAlignment="RightCenter"/>
+			Text="{../../../Value}" Margin="1" TextAlignment="Right"/>
 		<VerticalStack Width="-1" Height="{../../../TemplatedHeight}" Spacing="0" >
 			<Button MouseRepeat="true" Width="12" Height="8" MouseClick="../../../../onUp"
 				Template="#Crow.Templates.ArrowButTemplate.crow">
diff --git a/Tests/Interfaces/0.crow b/Tests/Interfaces/0.crow
index 0f55b6ce..9319aa60 100755
--- a/Tests/Interfaces/0.crow
+++ b/Tests/Interfaces/0.crow
@@ -2,17 +2,17 @@
 <VerticalStack Fit="true">
 	<ProgressBar CornerRadius="5" Background="DimGray" Margin="1" Maximum="1000" Value="{fps}" Width="200" Height="15"/>
 	<HorizontalStack Fit="true">
-		<Label Text="Memory:" Width="50" TextAlignment="RightCenter"/>
+		<Label Text="Memory:" Width="50" TextAlignment="Right"/>
 		<Label Text="{memory}" Font="droid,12" 
 			Background="vgradient|0:BlueCrayola|1:Black"/>
 	</HorizontalStack>
 	<HorizontalStack Fit="true">
-		<Label Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+		<Label Text="Fps:" Width="50" TextAlignment="Right"/>
 		<Label Text="{fps}" Font="droid , 12"
 			Background="vgradient|0:LimeGreen|1:Black"/>
 	</HorizontalStack>
 <!--	<HorizontalStack Fit="true">
-		<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+		<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 		<Label Text="{layouting}" Font="droid,12"
 			Background="vgradient|0:AoEnglish|1:Black"/>
 	</HorizontalStack>-->
diff --git a/Tests/Interfaces/2.crow b/Tests/Interfaces/2.crow
index 2e8c766b..1bd3761d 100755
--- a/Tests/Interfaces/2.crow
+++ b/Tests/Interfaces/2.crow
@@ -4,9 +4,9 @@
 		<Label Text="centered" Width="80" Height="30" Background="DarkBlue" TextAlignment="Center"/>
 		<Label Text="top left" Width="80" Height="30" Background="DarkBlue" TextAlignment="TopLeft"/>
 		<Label Text="top right" Width="80" Height="30" Background="DarkBlue" TextAlignment="TopRight"/>
-		<Label Text="right center" Width="80" Height="30" Background="DarkBlue" TextAlignment="RightCenter"/>
+		<Label Text="right center" Width="80" Height="30" Background="DarkBlue" TextAlignment="Right"/>
 		<Label Text="bottom left" Width="80" Height="30" Background="DarkBlue" TextAlignment="BottomLeft"/>
-		<Label Text="bottom center" Width="80" Height="30" Background="DarkBlue" TextAlignment="BottomCenter"/>
+		<Label Text="bottom center" Width="80" Height="30" Background="DarkBlue" TextAlignment="Bottom"/>
 		<Label Text="bottom right" Width="80" Height="30" Background="DarkBlue" TextAlignment="BottomRight"/>
 	</HorizontalStack>
 	<HorizontalStack Fit="true">
diff --git a/Tests/Interfaces/4.crow b/Tests/Interfaces/4.crow
index 65d77421..84d8a783 100755
--- a/Tests/Interfaces/4.crow
+++ b/Tests/Interfaces/4.crow
@@ -3,373 +3,373 @@
 	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<ProgressBar CornerRadius="5" Background="DimGray" Margin="1" Maximum="1000" Value="{fps}" Width="200" Height="15"/>
 		<HorizontalStack Fit="true">
-			<Label Text="Memory:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Memory:" Width="50" TextAlignment="Right"/>
 			<Label Text="{memory}" Font="droid,12" TextAlignment="Center"
 				Background="vgradient|0:BlueCrayola|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 	</VerticalStack>
 	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 	</VerticalStack>
 	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 	</VerticalStack>
 	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Update:" Width="50" TextAlignment="Right"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 			<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 			<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+			<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 			<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Min:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 		<HorizontalStack Fit="true">
-			<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+			<Label Text="Max:" Width="50" TextAlignment="Right"/>
 			<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
diff --git a/Tests/Interfaces/fps.goml b/Tests/Interfaces/fps.goml
index ff742e7a..18f96c02 100755
--- a/Tests/Interfaces/fps.goml
+++ b/Tests/Interfaces/fps.goml
@@ -4,19 +4,19 @@
 		Margin="10" Focusable="True" >
 			<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 				<HorizontalStack Fit="true">
-					<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+					<Label Text="Update:" Width="50" TextAlignment="Right"/>
 					<Label Name="labUpdate" Text="{update}" Font="droid,12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
 				</HorizontalStack>
 				<HorizontalStack Fit="true">
-					<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+					<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 					<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
 				</HorizontalStack>
 				<HorizontalStack Fit="true">
-					<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+					<Label Text="Min:" Width="50" TextAlignment="Right"/>
 					<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
 				</HorizontalStack>
 				<HorizontalStack Fit="true">
-					<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+					<Label Text="Max:" Width="50" TextAlignment="Right"/>
 					<Label Text="{fpsMax}" Font="droid , 12" Background="AoEnglish" Width="50" TextAlignment="Center"/>
 				</HorizontalStack>
 			</VerticalStack>				
diff --git a/Tests/Interfaces/test4.1.goml b/Tests/Interfaces/test4.1.goml
index 6ad43bd2..ad4a37e3 100755
--- a/Tests/Interfaces/test4.1.goml
+++ b/Tests/Interfaces/test4.1.goml
@@ -24,7 +24,7 @@
 						BorderWidth="2" Foreground="White"/>
 <!--					<Label Name="labPb"
 						Width="20"
-						TextAlignment="RightCenter"/>
+						TextAlignment="Right"/>
 					<ProgressBar Name="pbBar"
 						Width="100" Height="10"
 						Value="30"/>-->
@@ -44,7 +44,7 @@
 				<Button Margin="5" BorderWidth="0" Background="Gray" Width="-1" Height="-1">
 					<Label FontSize="10" Text="This is a test" Margin="5" FontColor="White" Foreground="White" />
 				</Button>
-				<TextBoxWidget 	TextAlignment="LeftCenter" Font="droid,14"						
+				<TextBoxWidget 	TextAlignment="Left" Font="droid,14"						
 								Width="300" Height="-1" Margin="2"
 								Foreground="White" BorderWidth="1"
 								Text="editable text"/>
@@ -64,7 +64,7 @@
 					<Label Name="labUpdate" Text="xxxx" FontSize="16" Width="60" TextAlignment="Center" Background="DarkGreen"/>
 				</HorizontalStack>
 				<HorizontalStack>
-					<Label Text="Fps:" Width = "30" VerticalAlignment="Center"  TextAlignment="LeftCenter"/>
+					<Label Text="Fps:" Width = "30" VerticalAlignment="Center"  TextAlignment="Left"/>
 					<Label Name="labFps" Text="xxxx" Font="droid bold, 14"
 						TextAlignment="Center" Background="AoEnglish"/>
 				</HorizontalStack>
diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 429549c5..536fb3e9 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -38,7 +38,7 @@
 						<Button MouseClick="onButClick"/>
 					</VerticalStack>
 				</HorizontalStack>
-				<TextBox Name="textbox1" TextAlignment="LeftCenter" Font="droid,14"						
+				<TextBox Name="textbox1" TextAlignment="Left" Font="droid,14"						
 								Width="200" Height="-1" Margin="2" Background="White"
 								Forground="Black"
 								Foreground="DimGray" BorderWidth="1"
diff --git a/Tests/Interfaces/testExpandable.goml b/Tests/Interfaces/testExpandable.goml
index 880dcf10..a2fb1e78 100755
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@ -6,7 +6,7 @@
 			<CheckBox Name="chk3"/>
 			<CheckBox Name="chk4"/>
 			<HorizontalStack Fit="true" Margin="2" Background="Blue">
-				<Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="RightCenter"/>
+				<Label Name="captionFps" Text="Fps:" Width="30" TextAlignment="Right"/>
 				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="-1" TextAlignment="Center" Background="AoEnglish"/>
 			</HorizontalStack>
 		</VerticalStack>
diff --git a/Tests/Interfaces/testPopper.goml b/Tests/Interfaces/testPopper.goml
index 88668f3c..362972e7 100755
--- a/Tests/Interfaces/testPopper.goml
+++ b/Tests/Interfaces/testPopper.goml
@@ -8,7 +8,7 @@
 			<CheckBox Name="chk3"/>
 			<CheckBox Name="chk4"/>
 			<HorizontalStack Fit="true" Margin="20">
-				<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+				<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>
 			</HorizontalStack>
 		</VerticalStack>	
diff --git a/Tests/Interfaces/testTextBox.crow b/Tests/Interfaces/testTextBox.crow
index 9623284f..8a98ff84 100755
--- a/Tests/Interfaces/testTextBox.crow
+++ b/Tests/Interfaces/testTextBox.crow
@@ -2,23 +2,23 @@
 <VerticalStack Background="SteelBlue" Fit="true">
 	<HorizontalStack Fit="true">
 		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="TopLeft"/>
-		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="TopCenter"/>
+		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Top"/>
 		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="TopRight"/>
-		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="LeftCenter"/>
+		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Left"/>
 		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Center"/>
-		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="RightCenter"/>
+		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Right"/>
 		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="BottomLeft"/>
-		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="BottomCenter"/>
+		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Bottom"/>
 		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="BottomRight"/>
 	</HorizontalStack>
 	<HorizontalStack Fit="true">
-		<TextBox Background="DarkGray" Height="30" Width="70" TextAlignment="TopStretch" Text="TopStretch"/>
-		<TextBox Background="DarkGray" Height="30" Width="60" TextAlignment="HorizontalStretch" Text="HorizontalStretch" />
-		<TextBox Background="DarkGray" Height="30" Width="60" TextAlignment="BottomStretch" Text="BottomStretch"/>
-		<TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="LeftStretch" Text="LeftStretch"/>
-		<TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="VerticalStretch" Text="VerticalStretch"/>
-		<TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="RightStretch" Text="RightStretch"/>
-		<TextBox Background="DarkGray" Height="30" Width="50" TextAlignment="Fit" Text="Fit"/>
+		<TextBox Background="DarkGray" Height="30" Width="70" TextAlignment="Top" HorizontalStretch="true" Text="TopStretch"/>
+		<TextBox Background="DarkGray" Height="30" Width="60" TextAlignment="Center" HorizontalStretch="true" Text="HorizontalStretch" />
+		<TextBox Background="DarkGray" Height="30" Width="60" TextAlignment="Bottom" HorizontalStretch="true" Text="BottomStretch"/>
+		<TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="Left" VerticalStretch="true" Text="LeftStretch"/>
+		<TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="Center" VerticalStretch="true" Text="VerticalStretch"/>
+		<TextBox Background="DarkGray" Height="10" Width="70" TextAlignment="Right" VerticalStretch="true" Text="RightStretch"/>
+		<TextBox Background="DarkGray" Height="30" Width="50" HorizontalStretch="true" VerticalStretch="true" Text="Fit"/>
 	</HorizontalStack>	
 	<TextBox Name="tb" Multiline="true" Font="droid,16" Margin="5" Text="A\nBB\nCCC\nDDDD"/>
 	<TextBox Multiline="true" Font="droid,16" Name="tb5" Margin="5" Text="{../tb.SelectedText}"/>
diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index 9aa86afb..89e064d4 100755
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -36,32 +36,32 @@
 				Margin="10" Focusable="True" >
 					<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 						<HorizontalStack Fit="true">
-							<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Update:" Width="50" TextAlignment="Right"/>
 							<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
-							<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 							<Label Name="labLayouting" Text="{layouting}" Font="droid,12" Width="80" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
-							<Label Text="Drawing:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Drawing:" Width="50" TextAlignment="Right"/>
 							<Label Name="labDrawing" Text="{drawing}" Font="droid,12" Width="80" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
-							<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>
+							<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="Right"/>
 							<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" 
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
-							<Label Text="Min:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Min:" Width="50" TextAlignment="Right"/>
 							<Label Text="{fpsMin}" Font="droid , 12" Width="50" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
-							<Label Text="Max:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Max:" Width="50" TextAlignment="Right"/>
 							<Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center"
 								Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
@@ -72,11 +72,11 @@
 			<Container Name="MainGrp" Background="0,5;0,5;0,5;0,4" Fit="true" Margin="10">
 					<VerticalStack Fit="true" Spacing="10" >
 						<HorizontalStack Fit="true">
-							<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Update:" Width="50" TextAlignment="Right"/>
 							<Label Text="{update}" Font="droid,12" Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 						<HorizontalStack Fit="true">
-							<Label Text="Layouting:" Width="50" TextAlignment="RightCenter"/>
+							<Label Text="Layouting:" Width="50" TextAlignment="Right"/>
 							<Label Text="{layouting}" Font="droid,12" Background="vgradient|0:AoEnglish|1:Black"/>
 						</HorizontalStack>
 					</VerticalStack>
diff --git a/src/Enums.cs b/src/Enums.cs
index 68e1c30f..6cde0b34 100644
--- a/src/Enums.cs
+++ b/src/Enums.cs
@@ -10,28 +10,8 @@ namespace Crow
         Horizontal,
         Vertical
     }
-    public enum Alignment
-    {
-        None,
-        TopCenter,
-        TopStretch,
-        LeftCenter,
-        LeftStretch,
-        RightCenter,
-        RightStretch,
-        BottomCenter,
-        BottomStretch,
-        TopLeft,
-        TopRight,
-        BottomLeft,
-        BottomRight,
-        Center,
-        Fit,
-        HorizontalStretch,
-        VerticalStretch
-    }
 
-    public enum PanelBorderPosition
+    public enum Alignment
     {
         Top,
         Left,
@@ -41,9 +21,7 @@ namespace Crow
         TopRight,
         BottomLeft,
         BottomRight,
-        Moving,
-        Closing,
-        ClientArea
+		Center
     }
     public enum HorizontalAlignment
     {
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs
index 08e7211a..1ce9409b 100644
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Label.cs
@@ -30,7 +30,9 @@ namespace Crow
         
 		#region private and protected fields
 		string _text = "label";
-        Alignment _textAlignment = Alignment.LeftCenter;        
+        Alignment _textAlignment = Alignment.Left;
+		bool horizontalStretch = false;
+		bool verticalStretch = false;
 		bool _multiline = false;
 		Color selColor;
 		Color selFontColor;
@@ -73,7 +75,7 @@ namespace Crow
 				registerForGraphicUpdate ();
 			}
 		}
-        [XmlAttributeAttribute()][DefaultValue(Alignment.LeftCenter)]
+		[XmlAttributeAttribute()][DefaultValue(Alignment.Left)]
 		public Alignment TextAlignment
         {
             get { return _textAlignment; }
@@ -82,9 +84,32 @@ namespace Crow
 					return;
 				_textAlignment = value; 
 				registerForGraphicUpdate ();
+				registerForGraphicUpdate ();
 				NotifyValueChanged ("TextAlignment", _textAlignment);
 			}
         }
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool HorizontalStretch {
+			get { return horizontalStretch; }
+			set {
+				if (horizontalStretch == value)
+					return;
+				horizontalStretch = value; 
+				registerForGraphicUpdate ();
+				NotifyValueChanged ("HorizontalStretch", horizontalStretch);
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool VerticalStretch {
+			get { return verticalStretch; }
+			set {
+				if (verticalStretch == value)
+					return;
+				verticalStretch = value; 
+				NotifyValueChanged ("VerticalStretch", verticalStretch);
+
+			}
+		} 
 		[XmlAttributeAttribute()][DefaultValue("label")]
         public string Text
         {
@@ -358,62 +383,45 @@ namespace Crow
 				rText.X = cb.X;
 				rText.Y = cb.Y;
 			}else{
+				if (horizontalStretch) {
+					widthRatio = (float)cb.Width / rText.Width;
+					if (!verticalStretch)
+						heightRatio = widthRatio;
+				}if (verticalStretch) {
+					heightRatio = (float)cb.Height / rText.Height;
+					if (!horizontalStretch)
+						widthRatio = heightRatio;
+				}
+				
+				rText.Width = (int)(widthRatio * rText.Width);
+				rText.Height = (int)(heightRatio * rText.Height);
+
 				switch (TextAlignment)
 				{
-				case Alignment.None:
-					break;
 				case Alignment.TopLeft:     //ok
 					rText.X = cb.X;
 					rText.Y = cb.Y;
 					break;
-				case Alignment.TopCenter:   //ok
+				case Alignment.Top:   //ok						
 					rText.Y = cb.Y;
 					rText.X = cb.X + cb.Width / 2 - rText.Width / 2;
 					break;
 				case Alignment.TopRight:    //ok
-					rText.X = cb.Right - rText.Width;
-					rText.Y = cb.Y;
-					break;
-				case Alignment.TopStretch://ok
-					heightRatio = widthRatio = (float)cb.Width / rText.Width;
-					rText.X = cb.X;
 					rText.Y = cb.Y;
-					rText.Width = cb.Width;
-					rText.Height = (int)(rText.Height * heightRatio);
+					rText.X = cb.Right - rText.Width;
 					break;
-				case Alignment.LeftCenter://ok
+				case Alignment.Left://ok
 					rText.X = cb.X;
 					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
 					break;
-				case Alignment.LeftStretch://ok
-					heightRatio = widthRatio = (float)cb.Height / rText.Height;
-					rText.X = cb.X;
-					rText.Y = cb.Y;
-					rText.Height = cb.Height;
-					rText.Width = (int)(widthRatio * cb.Width);
-					break;
-				case Alignment.RightCenter://ok
+				case Alignment.Right://ok
 					rText.X = cb.X + cb.Width - rText.Width;
 					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
 					break;
-				case Alignment.RightStretch://ok
-					heightRatio = widthRatio = (float)cb.Height / rText.Height;
-					rText.Height = cb.Height;
-					rText.Width = (int)(widthRatio * rText.Width);
-					rText.X = cb.Right - rText.Width;
-					rText.Y = cb.Y;
-					break;
-				case Alignment.BottomCenter://ok
+				case Alignment.Bottom://ok
 					rText.X = cb.Width / 2 - rText.Width / 2;
 					rText.Y = cb.Height - rText.Height;
 					break;
-				case Alignment.BottomStretch://ok
-					heightRatio = widthRatio = (float)cb.Width / rText.Width;
-					rText.Width = cb.Width;
-					rText.Height = (int)(rText.Height * heightRatio);
-					rText.Y = cb.Bottom - rText.Height;
-					rText.X = cb.X;
-					break;
 				case Alignment.BottomLeft://ok
 					rText.X = cb.X;
 					rText.Y = cb.Bottom - rText.Height;
@@ -426,27 +434,6 @@ namespace Crow
 					rText.X = cb.X + cb.Width / 2 - rText.Width / 2;
 					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
 					break;
-				case Alignment.Fit://ok, peut être mieu aligné                            
-					widthRatio = (float)cb.Width / rText.Width;
-					heightRatio = (float)cb.Height / rText.Height;
-					rText = cb;
-					break;
-				case Alignment.HorizontalStretch://ok
-					heightRatio = widthRatio = (float)cb.Width / rText.Width;
-					rText.Width = cb.Width;
-					rText.Height = (int)(heightRatio * rText.Height);
-					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
-					rText.X = cb.X;
-					break;
-				case Alignment.VerticalStretch://ok
-					heightRatio = widthRatio = (float)cb.Height / rText.Height;
-					rText.Height = cb.Height;
-					rText.Width = (int)(widthRatio * rText.Width);
-					rText.X = cb.X + cb.Width / 2 - rText.Width / 2;
-					rText.Y = cb.Y;
-					break;
-				default:
-					break;
 				}
 			}
 
@@ -520,10 +507,10 @@ namespace Crow
 					(int)fe.Height);
 
 //				if (TextAlignment == Alignment.Center ||
-//					TextAlignment == Alignment.TopCenter ||
-//					TextAlignment == Alignment.BottomCenter)
+//					TextAlignment == Alignment.Top ||
+//					TextAlignment == Alignment.Bottom)
 //					lineRect.X += (rText.Width - lineLength) / 2;
-//				else if (TextAlignment == Alignment.RightCenter ||
+//				else if (TextAlignment == Alignment.Right ||
 //					TextAlignment == Alignment.TopRight ||
 //					TextAlignment == Alignment.BottomRight)
 //					lineRect.X += (rText.Width - lineLength);
diff --git a/src/GraphicObjects/TextRun.cs b/src/GraphicObjects/TextRun.cs
index 76dde9a8..a426bdee 100644
--- a/src/GraphicObjects/TextRun.cs
+++ b/src/GraphicObjects/TextRun.cs
@@ -30,7 +30,9 @@ namespace Crow
         
 		#region private and protected fields
 		protected string _text = "label";
-        Alignment _textAlignment = Alignment.LeftCenter;        
+        Alignment _textAlignment = Alignment.Left;
+		bool horizontalStretch = false;
+		bool verticalStretch = false;
 		bool _multiline;
 		bool wordWrap;
         protected Rectangle rText;
@@ -41,12 +43,34 @@ namespace Crow
 		#endregion
 
 
-        [XmlAttributeAttribute()][DefaultValue(Alignment.LeftCenter)]
+        [XmlAttributeAttribute()][DefaultValue(Alignment.Left)]
 		public Alignment TextAlignment
         {
             get { return _textAlignment; }
             set { _textAlignment = value; }
         }
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool HorizontalStretch {
+			get { return horizontalStretch; }
+			set {
+				if (horizontalStretch == value)
+					return;
+				horizontalStretch = value; 
+				registerForGraphicUpdate ();
+				NotifyValueChanged ("HorizontalStretch", horizontalStretch);
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue(false)]
+		public virtual bool VerticalStretch {
+			get { return verticalStretch; }
+			set {
+				if (verticalStretch == value)
+					return;
+				verticalStretch = value; 
+				NotifyValueChanged ("VerticalStretch", verticalStretch);
+
+			}
+		} 
 		[XmlAttributeAttribute()][DefaultValue("label")]
         public string Text
         {
@@ -185,63 +209,45 @@ namespace Crow
 				rText.X = cb.X;
 				rText.Y = cb.Y;
 			}else {
-				
+				if (horizontalStretch) {
+					widthRatio = (float)cb.Width / rText.Width;
+					if (!verticalStretch)
+						heightRatio = widthRatio;
+				}if (verticalStretch) {
+					heightRatio = (float)cb.Height / rText.Height;
+					if (!horizontalStretch)
+						widthRatio = heightRatio;
+				}
+
+				rText.Width = (int)(widthRatio * cb.Width);
+				rText.Height = (int)(heightRatio * cb.Height);
+
 				switch (TextAlignment)
 				{
-				case Alignment.None:
-					break;
 				case Alignment.TopLeft:     //ok
 					rText.X = cb.X;
 					rText.Y = cb.Y;
 					break;
-				case Alignment.TopCenter:   //ok
+				case Alignment.Top:   //ok						
 					rText.Y = cb.Y;
 					rText.X = cb.X + cb.Width / 2 - rText.Width / 2;
 					break;
 				case Alignment.TopRight:    //ok
-					rText.X = cb.Right - rText.Width;
-					rText.Y = cb.Y;
-					break;
-				case Alignment.TopStretch://ok
-					heightRatio = widthRatio = (float)cb.Width / rText.Width;
-					rText.X = cb.X;
 					rText.Y = cb.Y;
-					rText.Width = cb.Width;
-					rText.Height = (int)(rText.Height * heightRatio);
+					rText.X = cb.Right - rText.Width;
 					break;
-				case Alignment.LeftCenter://ok
+				case Alignment.Left://ok
 					rText.X = cb.X;
 					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
 					break;
-				case Alignment.LeftStretch://ok
-					heightRatio = widthRatio = (float)cb.Height / rText.Height;
-					rText.X = cb.X;
-					rText.Y = cb.Y;
-					rText.Height = cb.Height;
-					rText.Width = (int)(widthRatio * cb.Width);
-					break;
-				case Alignment.RightCenter://ok
+				case Alignment.Right://ok
 					rText.X = cb.X + cb.Width - rText.Width;
 					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
 					break;
-				case Alignment.RightStretch://ok
-					heightRatio = widthRatio = (float)cb.Height / rText.Height;
-					rText.Height = cb.Height;
-					rText.Width = (int)(widthRatio * cb.Width);
-					rText.X = cb.X;
-					rText.Y = cb.Y;
-					break;
-				case Alignment.BottomCenter://ok
+				case Alignment.Bottom://ok
 					rText.X = cb.Width / 2 - rText.Width / 2;
 					rText.Y = cb.Height - rText.Height;
 					break;
-				case Alignment.BottomStretch://ok
-					heightRatio = widthRatio = (float)cb.Width / rText.Width;
-					rText.Width = cb.Width;
-					rText.Height = (int)(rText.Height * heightRatio);
-					rText.Y = cb.Bottom - rText.Height;
-					rText.X = cb.X;
-					break;
 				case Alignment.BottomLeft://ok
 					rText.X = cb.X;
 					rText.Y = cb.Bottom - rText.Height;
@@ -254,27 +260,6 @@ namespace Crow
 					rText.X = cb.X + cb.Width / 2 - rText.Width / 2;
 					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
 					break;
-				case Alignment.Fit://ok, peut être mieu aligné                            
-					widthRatio = (float)cb.Width / rText.Width;
-					heightRatio = (float)cb.Height / rText.Height;
-					rText = cb;
-					break;
-				case Alignment.HorizontalStretch://ok
-					heightRatio = widthRatio = (float)cb.Width / rText.Width;
-					rText.Width = cb.Width;
-					rText.Height = (int)(heightRatio * rText.Height);
-					rText.Y = cb.Y + cb.Height / 2 - rText.Height / 2;
-					rText.X = cb.X;
-					break;
-				case Alignment.VerticalStretch://ok
-					heightRatio = widthRatio = (float)cb.Height / rText.Height;
-					rText.Height = cb.Height;
-					rText.Width = (int)(widthRatio * rText.Width);
-					rText.X = cb.X + cb.Width / 2 - rText.Width / 2;
-					rText.Y = cb.Y;
-					break;
-				default:
-					break;
 				}
 			}
 
-- 
2.47.3