diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-04-14 09:36:03 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-04-14 12:47:15 +0200 |
| commit | 7ff5f14fe6b875dff57b335c4eeeb42397a07c91 (patch) | |
| tree | 23f80be40c98b4d142894a607c8dd2f43112b523 /Tests/Interfaces | |
| parent | 0b005fefe69b67bf335c3c00944bbac73e8b4831 (diff) | |
proportional ui
Diffstat (limited to 'Tests/Interfaces')
| -rwxr-xr-x | Tests/Interfaces/0.crow | 48 | ||||
| -rwxr-xr-x | Tests/Interfaces/5.crow | 4 | ||||
| -rwxr-xr-x | Tests/Interfaces/7.crow | 46 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/0.crow | 6 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/1.crow | 4 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/2.crow | 4 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/4.crow | 377 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/5.crow | 6 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/6.crow | 6 | ||||
| -rwxr-xr-x | Tests/Interfaces/basicTests/7.crow | 46 | ||||
| -rwxr-xr-x | Tests/Interfaces/colorItem.crow | 4 | ||||
| -rwxr-xr-x | Tests/Interfaces/test1.goml | 2 | ||||
| -rwxr-xr-x | Tests/Interfaces/testColorList.crow | 2 | ||||
| -rwxr-xr-x | Tests/Interfaces/testImage.crow | 26 | ||||
| -rwxr-xr-x | Tests/Interfaces/testStacks.crow | 16 | ||||
| -rw-r--r-- | Tests/Interfaces/testTabView.crow | 2 |
16 files changed, 526 insertions, 73 deletions
diff --git a/Tests/Interfaces/0.crow b/Tests/Interfaces/0.crow index 7ed4da83..1f8f4c7f 100755 --- a/Tests/Interfaces/0.crow +++ b/Tests/Interfaces/0.crow @@ -1,46 +1,4 @@ <?xml version="1.0"?> -<VerticalStack Height="-1" Width="-1"> - <Label Width="0"/> - <Expandable Width="-1" Background="Gray"> - <Expandable Background="LightBlue"> - <Expandable Background="Green"> - <Expandable Background="LimeGreen"> - <Expandable Background="DimGray"> - <Expandable Width="0" Background="Yellow"> - <Expandable Background="NavyBlue"> - <Expandable Width="0" Background="Blue"> - <Expandable Width="0" Background="BlueCrayola"> - <Expandable Width="0" Background="Green"> - <Label Background="Red"/> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - <Expandable Width="0" Background="Gray"> - <Expandable Width="0" Background="LightBlue"> - <Expandable Width="0" Background="Green"> - <Expandable Width="0" Background="LimeGreen"> - <Expandable Width="0" Background="DimGray"> - <Expandable Width="0" Background="Yellow"> - <Expandable Width="0" Background="NavyBlue"> - <Expandable Width="0" Background="Blue"> - <Expandable Width="0" Background="BlueCrayola"> - <Expandable Width="0" Background="Green"> - <Label Background="Red"/> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> - </Expandable> -</VerticalStack> +<Container Background="Green" Margin="10"> + <GraphicObject Margin="10" Width="{../WidthPolicy}" Height="{../HeightPolicy}" Background="Red"/> +</Container>
\ No newline at end of file diff --git a/Tests/Interfaces/5.crow b/Tests/Interfaces/5.crow index c559544d..4d263508 100755 --- a/Tests/Interfaces/5.crow +++ b/Tests/Interfaces/5.crow @@ -28,7 +28,7 @@ <ScrollBar Orientation="Horizontal" Maximum="100" Value="50" Height="16" Width="150"/> <Spinner Value="100"/>--> </VerticalStack> -<!-- <VerticalStack Width="150" Height="-1" Margin="2" Spacing="2"> +<!-- <VerticalStack Width="150" Height="Fit" Margin="2" Spacing="2"> <TextRun Text="text run test" Width="0"/> <Label Text="label test" Width="0"/> <TextBox Text="text box test" Width="0"/> @@ -48,7 +48,7 @@ <GroupBox Caption="Group box" Width="0"> <Label Text="border test" Margin="3"/> </GroupBox> - <Container Height="-1" Width="0" Background="DimGray" Margin="3"> + <Container Height="Fit" Width="0" Background="DimGray" Margin="3"> <GraphicObject Width="20" Height="20" Background="LightGray"/> </Container> <ProgressBar Height="10" Width="0" Background="DimGray" Value="50" /> diff --git a/Tests/Interfaces/7.crow b/Tests/Interfaces/7.crow new file mode 100755 index 00000000..d8e9cd38 --- /dev/null +++ b/Tests/Interfaces/7.crow @@ -0,0 +1,46 @@ +<?xml version="1.0"?> +<VerticalStack Height="Fit" Width="Fit"> + <Label Width="0"/> + <Expandable Width="Fit" Background="Gray"> + <Expandable Background="LightBlue"> + <Expandable Background="Green"> + <Expandable Background="LimeGreen"> + <Expandable Background="DimGray"> + <Expandable Width="0" Background="Yellow"> + <Expandable Background="NavyBlue"> + <Expandable Width="0" Background="Blue"> + <Expandable Width="0" Background="BlueCrayola"> + <Expandable Width="0" Background="Green"> + <Label Background="Red"/> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + <Expandable Width="0" Background="Gray"> + <Expandable Width="0" Background="LightBlue"> + <Expandable Width="0" Background="Green"> + <Expandable Width="0" Background="LimeGreen"> + <Expandable Width="0" Background="DimGray"> + <Expandable Width="0" Background="Yellow"> + <Expandable Width="0" Background="NavyBlue"> + <Expandable Width="0" Background="Blue"> + <Expandable Width="0" Background="BlueCrayola"> + <Expandable Width="0" Background="Green"> + <Label Background="Red"/> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> +</VerticalStack> diff --git a/Tests/Interfaces/basicTests/0.crow b/Tests/Interfaces/basicTests/0.crow new file mode 100755 index 00000000..486399b8 --- /dev/null +++ b/Tests/Interfaces/basicTests/0.crow @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<Label Margin="50" Width="50%" Height="50%" TextAlignment="BottomRight" Background="Mantis"/> +<!--<Container Background="Green" Margin="10" Width="Fit" Height="Fit"> + <GraphicObject Margin="10" Width="{../WidthPolicy}" Height="{../HeightPolicy}" Background="Red" + MinimumSize="50;50"/> +</Container>-->
\ No newline at end of file diff --git a/Tests/Interfaces/basicTests/1.crow b/Tests/Interfaces/basicTests/1.crow new file mode 100755 index 00000000..7d370189 --- /dev/null +++ b/Tests/Interfaces/basicTests/1.crow @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<Container Background="Green" Margin="0"> + <GraphicObject Margin="0" Width="50" Height="50" Background="Red"/> +</Container>
\ No newline at end of file diff --git a/Tests/Interfaces/basicTests/2.crow b/Tests/Interfaces/basicTests/2.crow new file mode 100755 index 00000000..ce9448c7 --- /dev/null +++ b/Tests/Interfaces/basicTests/2.crow @@ -0,0 +1,4 @@ +<?xml version="1.0"?> +<Container Background="Green" Margin="0"> + <GraphicObject Margin="0" Width="90" Height="90%" Background="Red"/> +</Container>
\ No newline at end of file diff --git a/Tests/Interfaces/basicTests/4.crow b/Tests/Interfaces/basicTests/4.crow new file mode 100755 index 00000000..f696a9ec --- /dev/null +++ b/Tests/Interfaces/basicTests/4.crow @@ -0,0 +1,377 @@ +<?xml version="1.0"?> +<HorizontalStack Fit="true"> + <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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="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="Right"/> + <Label Text="{fpsMax}" Font="droid , 12" Width="50" TextAlignment="Center" + Background="vgradient|0:AoEnglish|1:Black"/> + </HorizontalStack> + </VerticalStack> +</HorizontalStack>
\ No newline at end of file diff --git a/Tests/Interfaces/basicTests/5.crow b/Tests/Interfaces/basicTests/5.crow new file mode 100755 index 00000000..40abe0f0 --- /dev/null +++ b/Tests/Interfaces/basicTests/5.crow @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<HorizontalStack Width="Stretched" Height="Stretched" Margin="5" Background="Mantis"> + <GraphicObject Background="Carmine" Width="40%" Height="20%"/> + <GraphicObject Background="Carmine" Width="Stretched" Height="20%"/> + <GraphicObject Background="Carmine" Width="40%" Height="20%"/> +</HorizontalStack> diff --git a/Tests/Interfaces/basicTests/6.crow b/Tests/Interfaces/basicTests/6.crow new file mode 100755 index 00000000..829c39f4 --- /dev/null +++ b/Tests/Interfaces/basicTests/6.crow @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<VerticalStack Fit="true" Background="DimGray" Margin="5"> +<!-- <RadioButton/>--> + <Label Text="a" Width="0" Background="Red"/> + <Label Text="{fps}" HorizontalAlignment="Right" Background="LimeGreen"/> +</VerticalStack> diff --git a/Tests/Interfaces/basicTests/7.crow b/Tests/Interfaces/basicTests/7.crow new file mode 100755 index 00000000..d8e9cd38 --- /dev/null +++ b/Tests/Interfaces/basicTests/7.crow @@ -0,0 +1,46 @@ +<?xml version="1.0"?> +<VerticalStack Height="Fit" Width="Fit"> + <Label Width="0"/> + <Expandable Width="Fit" Background="Gray"> + <Expandable Background="LightBlue"> + <Expandable Background="Green"> + <Expandable Background="LimeGreen"> + <Expandable Background="DimGray"> + <Expandable Width="0" Background="Yellow"> + <Expandable Background="NavyBlue"> + <Expandable Width="0" Background="Blue"> + <Expandable Width="0" Background="BlueCrayola"> + <Expandable Width="0" Background="Green"> + <Label Background="Red"/> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + <Expandable Width="0" Background="Gray"> + <Expandable Width="0" Background="LightBlue"> + <Expandable Width="0" Background="Green"> + <Expandable Width="0" Background="LimeGreen"> + <Expandable Width="0" Background="DimGray"> + <Expandable Width="0" Background="Yellow"> + <Expandable Width="0" Background="NavyBlue"> + <Expandable Width="0" Background="Blue"> + <Expandable Width="0" Background="BlueCrayola"> + <Expandable Width="0" Background="Green"> + <Label Background="Red"/> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> + </Expandable> +</VerticalStack> diff --git a/Tests/Interfaces/colorItem.crow b/Tests/Interfaces/colorItem.crow index da893c82..c096e77a 100755 --- a/Tests/Interfaces/colorItem.crow +++ b/Tests/Interfaces/colorItem.crow @@ -1,10 +1,10 @@ <?xml version="1.0"?> <HorizontalStack HorizontalAlignment="Left" - Height="-1" Width="0" Margin="1" Focusable="true" + Height="Fit" Width="Stretched" Margin="1" Focusable="true" MouseEnter="{Background=hgradient|0:DarkRed|1:Transparent}" MouseLeave="{Background=Transparent}"> <GraphicObject Height="12" Width="20" Background="{}" Margin="0" CornerRadius="3"/> - <Label Text="{Name}" Margin="0" Width="0"/> + <Label Text="{Name}" Margin="0" Width="Stretched"/> </HorizontalStack> diff --git a/Tests/Interfaces/test1.goml b/Tests/Interfaces/test1.goml index fbf788cf..74da4726 100755 --- a/Tests/Interfaces/test1.goml +++ b/Tests/Interfaces/test1.goml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Container Name="TopContainer" Width="400" Height="350" Margin="20" Focusable="True" Background="Yellow"> - <Container Name="MiddleContainer" Width="0" Height="0" + <Container Name="MiddleContainer" Width="50%" Height="Stretched" 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/testColorList.crow b/Tests/Interfaces/testColorList.crow index f98ef134..ccbbb094 100755 --- a/Tests/Interfaces/testColorList.crow +++ b/Tests/Interfaces/testColorList.crow @@ -10,7 +10,7 @@ <Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}" Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}" ValueChanged="../../../_scroller_ValueChanged"> - <VerticalStack Width="{../../../../WidthPolicy}" Height="-1" MinimumSize="10;10" + <VerticalStack Width="{../../../../WidthPolicy}" Height="Fit" MinimumSize="10;10" Name="List" Margin="0" VerticalAlignment="Top" HorizontalAlignment="Left" diff --git a/Tests/Interfaces/testImage.crow b/Tests/Interfaces/testImage.crow index d55db72d..83d9de6a 100755 --- a/Tests/Interfaces/testImage.crow +++ b/Tests/Interfaces/testImage.crow @@ -10,8 +10,8 @@ <Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" /> <Image Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" /> <Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" /> - <Image Background="vgradient|0:SkyBlue|1:White" Width="50" Height="-1" Path="#Tests.image.crow0.svg" /> - <Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="-1" Path="#Tests.image.crow0.svg" /> + <Image Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" /> + <Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" /> </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="SCALED NOT PROPORTIONNAL" Width="150"/> @@ -23,8 +23,8 @@ <Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" /> <Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" /> <Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="100" Height="50" Path="#Tests.image.crow0.svg" /> - <Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="-1" Path="#Tests.image.crow0.svg" /> - <Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="-1" Path="#Tests.image.crow0.svg" /> + <Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" /> + <Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" /> </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="UNSCALED" Width="150"/> @@ -36,8 +36,8 @@ <Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Tests.image.crow0.svg" /> <Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Tests.image.crow0.svg" /> <Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Tests.image.crow0.svg" /> - <Image Scaled="false" Background="Blue" Width="50" Height="-1" Path="#Tests.image.crow0.svg" /> - <Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Tests.image.crow0.svg" /> + <Image Scaled="false" Background="Blue" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" /> + <Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Tests.image.crow0.svg" /> </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="SCALED PROPORTIONNAL" Width="150"/> @@ -49,8 +49,8 @@ <Image Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> <Image Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> <Image Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> - <Image Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.tetra.png"/> - <Image Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.tetra.png"/> + <Image Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> + <Image Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="SCALED NOT PROPORTIONNAL" Width="150"/> @@ -62,8 +62,8 @@ <Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> <Image KeepProportions="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> <Image KeepProportions="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> - <Image KeepProportions="false" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.tetra.png"/> - <Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.tetra.png"/> + <Image KeepProportions="false" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> + <Image KeepProportions="false" Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> </HorizontalStack> <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Label Text="UNSCALED" Width="150"/> @@ -75,10 +75,10 @@ <Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="100" Path="#Crow.Images.Icons.tetra.png"/> <Image Scaled="false" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> <Image Scaled="false" Margin="10" Background="Blue" Width="100" Height="50" Path="#Crow.Images.Icons.tetra.png"/> - <Image Scaled="false" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.tetra.png"/> - <Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="-1" Path="#Crow.Images.Icons.tetra.png"/> + <Image Scaled="false" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> + <Image Scaled="false" Margin="10" Background="Blue" Width="50" Height="Fit" Path="#Crow.Images.Icons.tetra.png"/> </HorizontalStack> - <HorizontalStack Width="-1" Height="100" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> + <HorizontalStack Width="Fit" Height="100" Background="hgradient|0:DarkRed|1:Transparent" Margin="5"> <Image Background="Blue" Path="#Tests.image.crow0.svg" /> <Image Margin="10" Background="White" Path="#Tests.image.crow0.svg" /> <Image Background="White" Width="20" Height="10" Path="#Tests.image.crow0.svg" /> diff --git a/Tests/Interfaces/testStacks.crow b/Tests/Interfaces/testStacks.crow index 5283b00a..5c1be265 100755 --- a/Tests/Interfaces/testStacks.crow +++ b/Tests/Interfaces/testStacks.crow @@ -7,7 +7,7 @@ <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </VerticalStack> - <VerticalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <VerticalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="0"/> <TextRun Background="SkyBlue" Height="0"/> @@ -17,7 +17,7 @@ <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <HorizontalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> @@ -44,24 +44,24 @@ <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <HorizontalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <HorizontalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="0"/> <TextRun Background="SkyBlue"/> </HorizontalStack> </VerticalStack> - <VerticalStack Width="-1" Margin="5" Background="Gray"> - <VerticalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <VerticalStack Width="Fit" Margin="5" Background="Gray"> + <VerticalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue" HorizontalAlignment="Left"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </VerticalStack> - <VerticalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <VerticalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue" Width="0"/> <TextRun Background="SkyBlue" Height="0"/> @@ -71,7 +71,7 @@ <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> </HorizontalStack> - <HorizontalStack Width="0" Height="-1" Background="DimGray" Margin="5"> + <HorizontalStack Width="0" Height="Fit" Background="DimGray" Margin="5"> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> <TextRun Background="SkyBlue"/> diff --git a/Tests/Interfaces/testTabView.crow b/Tests/Interfaces/testTabView.crow index 3a081597..14c407ce 100644 --- a/Tests/Interfaces/testTabView.crow +++ b/Tests/Interfaces/testTabView.crow @@ -31,7 +31,7 @@ </TabItem> </TabView> <Button Background="vgradient|0:DimGray|1:Black" HorizontalAlignment="Right" - Caption="Add new tab" Width="-1" Height="30" MouseClick="onAddTabButClick"/> + Caption="Add new tab" Width="Fit" Height="30" MouseClick="onAddTabButClick"/> </VerticalStack> <TabView CacheEnabled="false" Width="200" Height="200" Orientation="Horizontal" Spacing="20" Margin="0"> <TabItem |