Layouting queue, debug

test4 validated

6 files changed, 151 insertions, 12 deletions

diff --git a/Tests/Interfaces/fps.goml b/Tests/Interfaces/fps.goml
new file mode 100755
index 00000000..85b60afd
--- /dev/null
+++ b/Tests/Interfaces/fps.goml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>

+<Container Name="MainGrp"

+	HorizontalAlignment="Right" VerticalAlignment="Bottom"

+	Margin="10" Focusable="True" Fit="True">

+

+		<VerticalStack Fit="True" BorderWidth="1" Margin="5" WidgetSpacing="4">

+			<HorizontalStack>

+				<Label Text="Update:" FontColor="White" VerticalAlignment="Center" />

+				<Label Name="labUpdate" Text="xxxx" FontSize="12" Width="60" TextAlignment="Center" Background="DarkGreen"/>

+			</HorizontalStack>

+			<HorizontalStack>

+				<Label Text="Fps:" Width = "30" VerticalAlignment="Center"  TextAlignment="LeftCenter"/>

+				<Label Name="labFps" Text="xxxx" Font="droid bold, 12"

+					TextAlignment="Center" Background="AoEnglish"/>

+			</HorizontalStack>

+			<HorizontalStack>

+				<Label Text="Min:" Width = "30" />

+				<Label Name="labFpsMin" Text="xxxx" Font="droid bold, 12"

+					TextAlignment="Center" Background="AoEnglish"/>

+			</HorizontalStack>

+			<HorizontalStack>

+				<Label Text="Max:" Width = "30"/>

+				<Label Name="labFpsMax" Text="xxxx" Font="droid bold, 12"

+					TextAlignment="Center" Background="AoEnglish"/>

+			</HorizontalStack>

+		</VerticalStack>				

+</Container>
\ No newline at end of file
diff --git a/Tests/Interfaces/test1.1.goml b/Tests/Interfaces/test1.1.goml
index 6ccf2c1c..86faa998 100755
--- a/Tests/Interfaces/test1.1.goml
+++ b/Tests/Interfaces/test1.1.goml
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>

-<Group Width="0" Height="0" Margin="50"

+<Group Name="TopGroup" Width="500" Height="400" Margin="5"

 	Focusable="True" Background="Yellow">

-	<Group Width="-1" Height="-1" Margin="50" 

+	<Group Name="InnerGroup" Width="-1" Height="-1" Margin="50" 

 		VerticalAlignment="Top" HorizontalAlignment="Left"

 		Focusable="True" Background="Green">

 		<Image VerticalAlignment="Bottom"			

-			Name="PhaseOverlay" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

+			Name="PhaseOverlay1" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

 		<Image Top="100"		

-			Name="PhaseOverlay" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

+			Name="PhaseOverlay2" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

 	</Group>

-	<Image Top="100"		

-		Name="PhaseOverlay" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

+	<Image VerticalAlignment="Center" HorizontalAlignment="Right"

+		Name="PhaseOverlay0" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

 

 </Group>
\ No newline at end of file
diff --git a/Tests/Interfaces/test1.2.goml b/Tests/Interfaces/test1.2.goml
index 1ccc51ec..c467cd51 100755
--- a/Tests/Interfaces/test1.2.goml
+++ b/Tests/Interfaces/test1.2.goml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>

-<Container>

-<VerticalStack>

+<Container Background="Green" Height="400" Width="400">

+<VerticalStack Margin="10" Background="DarkBlue" Height="-1" Width="0">

 	<Label Text="label11"/>

 	<Label Text="label21"/>

-	<HorizontalStack Width="-1" Height="-1" Margin="50"

-		Focusable="True" Background="DarkBlue">

+	<HorizontalStack Width="-1" Height="-1" Margin="5"

+		Focusable="True" Background="Blue">

 		<Label Text="label12"/>

 		<Label Text="label22"/>

 		<Label Text="label32"/>

diff --git a/Tests/Interfaces/test1.3.goml b/Tests/Interfaces/test1.3.goml
new file mode 100755
index 00000000..c6fffe4e
--- /dev/null
+++ b/Tests/Interfaces/test1.3.goml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>

+<Container Name="MainMenu"	

+	Margin="30" Focusable="True" Height="-1" Width="300">

+	<Border BorderWidth="1" Margin="40" Background="0,5;0,5;0,5;0,5">

+		<VerticalStack WidgetSpacing="10">

+			<Button Margin = "10" Text="Start New Game" Height="-1" Width="0" 

+				MouseClick="onStartNewGame"/>

+			<Button Margin = "10" Text="Start New Game" Height="-1" Width="0"/>

+			<Button Margin = "10" Text="Start New Game" Height="-1" Width="0"/>

+			<Button Margin = "10" Text="Exit" Height="-1" Width="0"

+				MouseClick="onButExit_MouseClick" />

+		</VerticalStack>

+	</Border>				

+</Container>
\ No newline at end of file
diff --git a/Tests/Interfaces/test1.goml b/Tests/Interfaces/test1.goml
index 9601a87b..2177065e 100755
--- a/Tests/Interfaces/test1.goml
+++ b/Tests/Interfaces/test1.goml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>

-<Container Width="300" Height="-1"

+<Container Name="TopContainer" Width="400" Height="350"

 	Margin="20" Focusable="True" Background="Yellow">

 

-	<Container Width="-1" Height="-1"

+	<Container Name="MiddleContainer" Width="0" Height="0"

 		Margin="20" Focusable="True" Background="Green">

 			<Image VerticalAlignment="Bottom"			

 				Name="PhaseOverlay" Width="100" Height="100" Path="image/u.svg" Background="Red"/>

diff --git a/Tests/Interfaces/test4.1.goml b/Tests/Interfaces/test4.1.goml
new file mode 100755
index 00000000..d854d0a0
--- /dev/null
+++ b/Tests/Interfaces/test4.1.goml
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>

+<Group Name="MainGrp"

+	Width="800" Height="500"

+	Background="0,5;0,5;0,5;0,5" Foreground="White"

+	Margin="10" >

+	<Border 

+		BorderWidth="2" BorderColor="Transparent"

+		Focusable="True"

+		MouseEnter="{BorderColor = White}"

+		MouseLeave="{BorderColor = Transparent}">

+

+		<HorizontalStack Name="hs0"

+			WidgetSpacing="10" 

+			VerticalAlignment="Top" 

+			Background="0,5;0,5;0,5;0,5">

+			<VerticalStack Name="vs1"

+				Margin="20">

+				<Label Name="labMouse" Text="MousePos"/>

+				<HorizontalStack Name="hsPbar">

+					<ProgressBar Name="pbBar" 

+						Width="100" Height="20"

+						Value="50"

+						Foreground="BlueCrayola" Background="DarkGray"

+						BorderWidth="2" BorderColor="White"/>

+					<Label Name="labPb"

+						Width="20"

+						TextAlignment="RightCenter"/>

+					<ProgressBar Name="pbBar"

+						Width="100" Height="10"

+						Value="30"/>

+				</HorizontalStack>

+				<HorizontalStack  Name="hsFocus" HorizontalAlignment="Left">

+					<Label Text="Focused:"/>

+					<Label Name="labFocus" Width="200"/>

+				</HorizontalStack>

+				<HorizontalStack>

+					<Label Text="Active:"  Name="hsActive"/>

+					<Label Name="labActive" Width="200"/>

+				</HorizontalStack>

+				<HorizontalStack>

+					<Label Text="Hover:"  Name="hsHover"/>

+					<Label Name="labHover" Width="200"/>

+				</HorizontalStack>

+				<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"						

+								Width="300" Height="-1" Margin="2"

+								BorderColor="White" BorderWidth="1"

+								Text="editable text"/>

+				<GroupBox Title="Group Box" Width="300" Height="100" 

+					BorderColor="White" BorderWidth="2" Margin="3">

+					<Label Name="labValue" FontSize="14" Text="000"	TextAlignment="Center"/>

+				</GroupBox>

+				<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />

+				<GraduatedSlider Name="slider" Height="30" Width="300" Foreground="BlueBell"/>

+			</VerticalStack>

+			<VerticalStack Width="-1" Height="-1" BorderWidth="1" Margin="5" WidgetSpacing="4">

+<!--				<Button Width="-1" Height="-1" Margin="5">

+					<Image Path="/mnt/data/Images/130px-Blason_ville_fr_Aubure_(Haut-Rhin).svg.png"/>

+				</Button>-->

+				<HorizontalStack>

+					<Label Text="Update" FontColor="White" VerticalAlignment="Center" />

+					<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 Name="labFps" Text="xxxx" Font="droid bold, 14"

+						TextAlignment="Center" Background="AoEnglish"/>

+				</HorizontalStack>

+				<HorizontalStack>

+					<Label Text="Min:" Width = "30" />

+					<Label Name="labFpsMin" Text="xxxx" Font="droid bold, 14"

+						TextAlignment="Center" Background="AoEnglish"/>

+				</HorizontalStack>

+				<HorizontalStack>

+					<Label Text="Max:" Width = "30"/>

+					<Label Name="labFpsMax" Text="xxxx" Font="droid bold, 14"

+						TextAlignment="Center" Background="AoEnglish"/>

+				</HorizontalStack>

+			</VerticalStack>

+

+			<Scroller Background="DimGray" Height="350" Width="300"  

+				 Margin="5" VerticalScrolling="true">

+				<VerticalStack Name="colors" VerticalAlignment="Top" Margin="5">

+					<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"

+								BorderWidth="2" BorderColor="White" Foreground="BlueCrayola" Background="DarkGray"/>

+				</VerticalStack>

+			</Scroller>

+

+		</HorizontalStack>

+

+		<Slider 

+			Height="20" Width="300" 

+			Background="Transparent"

+			VerticalAlignment="Bottom" />

+		</Border>

+</Group>
\ No newline at end of file