aboutsummaryrefslogtreecommitdiffstatsci
path: root/Tests/Interfaces
diff options
context:
space:
mode:
authorjpbruyere <jp.bruyere@hotmail.com>2015-09-07 16:19:58 +0200
committerjpbruyere <jp.bruyere@hotmail.com>2015-09-07 16:19:58 +0200
commit967f9bbeca46517f3d94d1eb4b04a3e36c8a31f0 (patch)
treed6fb1e98074c85ecdb934c964da8418c16652baf /Tests/Interfaces
parentac08ff01dbc59628a94a6e09cd0aff07f588f05f (diff)
Dynamic layouting debug and improvments
Diffstat (limited to 'Tests/Interfaces')
-rwxr-xr-xTests/Interfaces/test4.goml4
-rwxr-xr-xTests/Interfaces/testWindow.goml23
-rwxr-xr-xTests/Interfaces/test_stack.goml13
3 files changed, 24 insertions, 16 deletions
diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 02dadec8..4d824a2e 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -134,8 +134,8 @@
TextAlignment="Center" Background="AoEnglish"/>
</HorizontalStack>
</VerticalStack>
- <HorizontalStack Height="350" Width="150">
- <Scroller Name="scroller1" Background="DimGray" Height="0" Width="0"
+ <HorizontalStack Height="350" Width="-1">
+ <Scroller Name="scroller1" Background="DimGray" Height="0" Width="-1"
Margin="5" VerticalScrolling="true" ScrollY="{../scrollbar1.Scroll}">
<VerticalStack Name="colors" VerticalAlignment="Top" Margin="1">
<ProgressBar Name="pbBar2" Width="100" Height="20" Value="50"
diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index d4246ac2..ae9cbc25 100755
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -2,23 +2,28 @@
<!--<Group>-->
<Window Name="window1" Left="10" Top="10" Title="Test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,5"
Focusable="True">
- <VerticalStack Height="0" Width="0">
- <Slider Name="slider" Height="10" Width="150"/>
- <Label Text="{fps}" Background="DarkRed"/>
- <Label Text="{fpsMin}" />
- <Label Text="{fpsMax}" />
- <HorizontalStack Width="150" Height="-1" Margin="5" Background="Red">
+ <VerticalStack Name="contentVSStack" Height="0" Width="0" Margin="1" Spacing="10">
+ <Slider Name="slider" Height="20" Width="0"/>
+
+ <HorizontalStack Width="0" Height="-1" Margin="0" Background="Red">
<Checkbox Height="-1" Width="-1"/>
<Checkbox Height="-1" Width="-1"/>
</HorizontalStack>
- <GroupBox Title="test" Height="-1" Width="-1" Margin="5">
- <VerticalStack Width="100">
+ <GroupBox Title="test" Height="0" Width="0" Margin="0">
+ <VerticalStack Width="0">
<RadioButton Caption="Radio 1"/>
<RadioButton Caption="Radio 2" IsChecked="true"/>
<RadioButton Caption="Radio 3"/>
-
+ <RadioButton Caption="Radio 4"/>
+ <RadioButton Caption="Radio 5"/>
+ <RadioButton Caption="Radio 6"/>
+ <RadioButton Caption="Radio 7"/>
</VerticalStack>
</GroupBox>
+<!-- <Checkbox Height="-1" Width="-1" Background="Red" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->
</VerticalStack>
</Window>
<!--</Group>-->
+<!-- <Label Text="{fps}" Background="DarkRed"/>
+ <Label Text="{fpsMin}" />
+ <Label Text="{fpsMax}" />--> \ No newline at end of file
diff --git a/Tests/Interfaces/test_stack.goml b/Tests/Interfaces/test_stack.goml
index a1b4b4e0..2991a92e 100755
--- a/Tests/Interfaces/test_stack.goml
+++ b/Tests/Interfaces/test_stack.goml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
-<VerticalStack Background="DarkBlue" Height="-1" Width="200">
- <Label Text="label11" Width="0" Background="Green"/>
- <Label Text="label21"/>
+<VerticalStack Background="DarkBlue" Height="300" Width="200">
+<!-- <Label Text="label11" Width="0" Background="Green"/>
+ <Label Text="label21"/>-->
<!-- <HorizontalStack Width="-1" Height="-1" Margin="5"
Focusable="True" Background="Blue">
<Label Text="label12"/>
@@ -11,7 +11,10 @@
<Label Text="label52"/>
</HorizontalStack>
<Label Text="label33" Background="Green" Width="0"/>-->
+<!-- <Label Text="label43"/>-->
+ <Border Margin="10">
+ <Label Text="label53" Background="Red" Height="0" CornerRadius="10"/>
+ </Border>
+ <Label Text="label43"/>
<Label Text="label43"/>
- <Label Text="label53"/>
-
</VerticalStack>