aboutsummaryrefslogtreecommitdiffstatsci
path: root/Tests
diff options
context:
space:
mode:
authorj-p <jp.bruyere@live.be>2016-10-04 16:55:37 +0200
committerGitHub <noreply@github.com>2016-10-04 16:55:37 +0200
commitfaad767304aa1280a907c9851e40d2b82a1a4f54 (patch)
treef345bb4a1db2f8f16936019ee9651a20953b6a99 /Tests
parent2616e6ee7a1a34036cc002d28543d0d7a657fdb2 (diff)
Inherited dims (#31)v0.5
* Implement 'Inherit' measure to reduce bindings load. modifié : Templates/ArrowButTemplate.crow modifié : Templates/Button.template modifié : Templates/CheckBox.template modifié : Templates/ComboBox.template modifié : Templates/DirectoryView.template modifié : Templates/Expandable.template modifié : Templates/GroupBox.template modifié : Templates/ListBox.template modifié : Templates/Menu.template modifié : Templates/MenuItem.template modifié : Templates/MessageBox.template modifié : Templates/Popper.template modifié : Templates/RadioButton.template modifié : Templates/ScrollBar.template modifié : Templates/ScrollingListBox.goml modifié : Templates/Spinner.template modifié : Templates/TabItem.template modifié : Templates/TreeView.template modifié : Templates/Window.template modifié : Templates/treeList.crow modifié : Tests/Interfaces/Container/0.crow modifié : Tests/Interfaces/TemplatedContainer/testTreeView.crow modifié : Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow modifié : Tests/Interfaces/TmpExpandable.goml modifié : Tests/Interfaces/treeList.crow modifié : Tests/ui/Popper.template modifié : Tests/ui/tmpWindow.crow modifié : src/GraphicObjects/GraphicObject.cs modifié : src/Measure.cs * leave template bindings for sizing in ScrollBar template because Inherited values are not working. modifié : Templates/ScrollBar.template renommé : Tests/Interfaces/TemplatedControl/testScrollbar.goml -> Tests/Interfaces/TemplatedControl/testScrollbar.crow renommé : Tests/Interfaces/TemplatedControl/testSpinner.goml -> Tests/Interfaces/TemplatedControl/testSpinner.crow modifié : Tests/Tests.csproj * update nuspec
Diffstat (limited to 'Tests')
-rwxr-xr-xTests/Interfaces/Container/0.crow2
-rwxr-xr-xTests/Interfaces/TemplatedContainer/testTreeView.crow15
-rwxr-xr-xTests/Interfaces/TemplatedControl/testItemTemplateTag.crow10
-rwxr-xr-xTests/Interfaces/TemplatedControl/testScrollbar.crow (renamed from Tests/Interfaces/TemplatedControl/testScrollbar.goml)0
-rwxr-xr-xTests/Interfaces/TemplatedControl/testSpinner.crow (renamed from Tests/Interfaces/TemplatedControl/testSpinner.goml)0
-rwxr-xr-xTests/Interfaces/TmpExpandable.goml8
-rwxr-xr-xTests/Interfaces/treeList.crow3
-rw-r--r--Tests/Tests.csproj12
-rwxr-xr-xTests/ui/Popper.template2
-rwxr-xr-xTests/ui/tmpWindow.crow10
10 files changed, 29 insertions, 33 deletions
diff --git a/Tests/Interfaces/Container/0.crow b/Tests/Interfaces/Container/0.crow
index a69e6f69..be2e16e6 100755
--- a/Tests/Interfaces/Container/0.crow
+++ b/Tests/Interfaces/Container/0.crow
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<Container Background="Onyx" Margin="10" Width="90%" Height="90%">
- <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="Mantis"
+ <GraphicObject Margin="10" Background="Mantis"
MinimumSize="50,50"/>
</Container> \ No newline at end of file
diff --git a/Tests/Interfaces/TemplatedContainer/testTreeView.crow b/Tests/Interfaces/TemplatedContainer/testTreeView.crow
index e8e71645..fb4cbe87 100755
--- a/Tests/Interfaces/TemplatedContainer/testTreeView.crow
+++ b/Tests/Interfaces/TemplatedContainer/testTreeView.crow
@@ -12,8 +12,8 @@
<ItemTemplate DataType="System.IO.DirectoryInfo" Data="GetFileSystemInfos">
<Expandable Caption="{Name}" >
<Template>
- <VerticalStack Height="{./HeightPolicy}" Width="{./WidthPolicy}">
- <HorizontalStack Spacing="1" Height="Fit" Width="{./WidthPolicy}"
+ <VerticalStack>
+ <HorizontalStack Spacing="1" Height="Fit"
MouseEnter="{Background=hgradient|0:BlueCrayola|1:Transparent}"
MouseLeave="{Background=Transparent}">
<Image Margin="2" Width="12" Height="12"
@@ -22,17 +22,16 @@
SvgSub="{./IsExpanded}"/>
<Image Margin="2" Width="14" Height="14"
Path="#Crow.Images.Icons.folder.svg"/>
- <Label Text="{./Caption}" Width="{./WidthPolicy}"/>
+ <Label Text="{./Caption}"/>
</HorizontalStack>
- <Container Name="Content" Visible="false"
- Height="{./HeightPolicy}" Width="{./WidthPolicy}"/>
+ <Container Name="Content" Visible="false"/>
</VerticalStack>
</Template>
- <HorizontalStack Height="Fit" Width="{./WidthPolicy}">
+ <HorizontalStack Height="Fit">
<GraphicObject Width="12" Height="10"/>
- <TreeView Name="List" Height="Fit" Width="{./WidthPolicy}">
+ <TreeView Name="List" Height="Fit">
<Template>
- <VerticalStack Height="Fit" Width="{../WidthPolicy}" Name="ItemsContainer"/>
+ <VerticalStack Height="Fit" Name="ItemsContainer"/>
</Template>
</TreeView>
</HorizontalStack>
diff --git a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
index 94625915..f4d37a74 100755
--- a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
+++ b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
@@ -4,12 +4,12 @@
<ListBox Data="{TestList}" Background="0.5,0.5,0.5,0.7"
HorizontalAlignment="Center" Width="200" Height="200" Margin="5">
<Template>
- <Border BorderWidth="1" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
- <HorizontalStack Margin="1" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}" >
- <Scroller Name="scroller1" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"
+ <Border BorderWidth="1">
+ <HorizontalStack Margin="1">
+ <Scroller Name="scroller1"
Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}"
ValueChanged="../../../_scroller_ValueChanged">
- <VerticalStack Width="{../../../../WidthPolicy}" Height="Fit" MinimumSize="10,10"
+ <VerticalStack Height="Fit" MinimumSize="10,10"
Name="ItemsContainer" Margin="0"
VerticalAlignment="Top"
HorizontalAlignment="Left"
@@ -17,7 +17,7 @@
</Scroller>
<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}"
Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
- Width="14" Height="{../../../HeightPolicy}" />
+ Width="14"/>
</HorizontalStack>
</Border>
</Template>
diff --git a/Tests/Interfaces/TemplatedControl/testScrollbar.goml b/Tests/Interfaces/TemplatedControl/testScrollbar.crow
index c494e347..c494e347 100755
--- a/Tests/Interfaces/TemplatedControl/testScrollbar.goml
+++ b/Tests/Interfaces/TemplatedControl/testScrollbar.crow
diff --git a/Tests/Interfaces/TemplatedControl/testSpinner.goml b/Tests/Interfaces/TemplatedControl/testSpinner.crow
index 4efd587a..4efd587a 100755
--- a/Tests/Interfaces/TemplatedControl/testSpinner.goml
+++ b/Tests/Interfaces/TemplatedControl/testSpinner.crow
diff --git a/Tests/Interfaces/TmpExpandable.goml b/Tests/Interfaces/TmpExpandable.goml
index 1cd05fd7..9dddcebb 100755
--- a/Tests/Interfaces/TmpExpandable.goml
+++ b/Tests/Interfaces/TmpExpandable.goml
@@ -3,10 +3,10 @@
<Label Text="{../../Caption}" Width="{../../WidthPolicy}"/>
<Container Name="Content" Visible="false" Height="{../../HeightPolicy}" Width="{../../WidthPolicy}"/>
</VerticalStack>-->
-<Group BorderWidth="1" Foreground="LightGray" Height="{../HeightPolicy}" Width="{../WidthPolicy}"
+<Group BorderWidth="1" Foreground="LightGray"
MouseClick="../onMouseClick">
- <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
- <Label Text="{../../../Caption}" Width="{../../../WidthPolicy}"/>
- <Container Name="Content" Visible="false" Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"/>
+ <VerticalStack>
+ <Label Text="{../../../Caption}"/>
+ <Container Name="Content" Visible="false"/>
</VerticalStack>
</Group> \ No newline at end of file
diff --git a/Tests/Interfaces/treeList.crow b/Tests/Interfaces/treeList.crow
index 61ee12a4..ca59c17f 100755
--- a/Tests/Interfaces/treeList.crow
+++ b/Tests/Interfaces/treeList.crow
@@ -1,3 +1,2 @@
<?xml version="1.0"?>
-<VerticalStack
- Height="Fit" Width="{../WidthPolicy}" Name="List"/> \ No newline at end of file
+<VerticalStack Height="Fit" Name="List"/> \ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 1095bd6a..771c8b4a 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -256,12 +256,6 @@
<None Include="Interfaces\TemplatedControl\testRadioButton.crow">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
- <None Include="Interfaces\TemplatedControl\testScrollbar.goml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
- <None Include="Interfaces\TemplatedControl\testSpinner.goml">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </None>
<None Include="Interfaces\TemplatedContainer\test_Listbox.crow">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
@@ -301,6 +295,12 @@
<None Include="Interfaces\TemplatedGroup\2.crow">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
+ <None Include="Interfaces\TemplatedControl\testScrollbar.crow">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ <None Include="Interfaces\TemplatedControl\testSpinner.crow">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
</ItemGroup>
<ItemGroup>
<Folder Include="Interfaces\" />
diff --git a/Tests/ui/Popper.template b/Tests/ui/Popper.template
index ffcd8d45..ae8c63c2 100755
--- a/Tests/ui/Popper.template
+++ b/Tests/ui/Popper.template
@@ -1,3 +1,3 @@
<?xml version="1.0"?>
<Label Text="{../Caption}" Style="#Tests.ui.LabelButton.style"
- Height="Fit" Width="{../WidthPolicy}"/>
+ Height="Fit"/>
diff --git a/Tests/ui/tmpWindow.crow b/Tests/ui/tmpWindow.crow
index 824ad704..64c97d55 100755
--- a/Tests/ui/tmpWindow.crow
+++ b/Tests/ui/tmpWindow.crow
@@ -1,11 +1,10 @@
<?xml version="1.0"?>
-<Border BorderWidth="1" Foreground="White" CornerRadius="15"
- Height="{../HeightPolicy}" Width="{../WidthPolicy}"
+<Border BorderWidth="1" Foreground="White" CornerRadius="15"
MouseEnter="../onBorderMouseEnter"
MouseLeave="../onBorderMouseLeave"
Background="vgradient|0:0.6,0.6,0.6,0.9|1:0.4,0.4,0.4,0.6">
- <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
- <HorizontalStack Height="Fit" Width="{../../../WidthPolicy}">
+ <VerticalStack>
+ <HorizontalStack Height="Fit">
<Label Margin="2" Font="{../../../../Font}" Text="{../../../../Title}" Width="Stretched"/>
<Border HorizontalAlignment="Right" Margin="0" VerticalAlignment="Top"
CornerRadius="6" BorderWidth="1" Foreground="Transparent"
@@ -15,7 +14,6 @@
MouseClick="../../../../../butQuitPress"/>
</Border>
</HorizontalStack>
- <Container Name="Content"
- Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"/>
+ <Container Name="Content"/>
</VerticalStack>
</Border> \ No newline at end of file