test case for layouting

diff --git a/Crow.csproj b/Crow.csproj
index 851f75e124e221a79ca31d5d2bb8d37beb503dd9..3b142f7572b5ce8f596a071dd357c78b7bfbbe72 100644 (file)
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD_TIME0;DEBUG_LAYOUTING;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
+    <DefineConstants>DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD_TIME0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
   </PropertyGroup>
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">
     <DefineConstants>__linux__</DefineConstants>

diff --git a/Crow.userprefs b/Crow.userprefs
index 95e9d4fef076b12922ded4689aede63711328206..d17e4d365f0f5abcf8af743ae81f28968f7d03cd 100644 (file)
--- a/Crow.userprefs
+++ b/Crow.userprefs
@@ -1,14 +1,17 @@
 <Properties GitUserInfo="UsingGIT" StartupItem="Tests/Tests.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|Linux_x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/GraphicObjects/GenericStack.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="src/LayoutingQueueItem.cs">
     <Files>
-      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="627" Column="5" />
-      <File FileName="src/GraphicObjects/Group.cs" Line="165" Column="15" />
-      <File FileName="src/GraphicObjects/PrivateContainer.cs" Line="132" Column="57" />
-      <File FileName="src/GraphicObjects/GenericStack.cs" Line="170" Column="1" />
-      <File FileName="Tests/GOLIBTests.cs" Line="50" Column="11" />
-      <File FileName="Tests/Interfaces/0.crow" Line="1" Column="1" />
-      <File FileName="Tests/Interfaces/testWindow.goml" Line="22" Column="5" />
+      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="589" Column="47" />
+      <File FileName="Tests/Interfaces/0.crow" Line="13" Column="49" />
+      <File FileName="src/LayoutingQueueItem.cs" Line="54" Column="57" />
+      <File FileName="src/LayoutingQueue.cs" Line="50" Column="48" />
+      <File FileName="Tests/Interfaces/testWindow.goml" Line="9" Column="55" />
+      <File FileName="Templates/CheckBox.goml" Line="10" Column="46" />
+      <File FileName="src/GraphicObjects/Group.cs" Line="152" Column="45" />
+      <File FileName="src/OpenTKGameWindow.cs" Line="411" Column="43" />
+      <File FileName="src/GraphicObjects/Slider.cs" Line="75" Column="41" />
+      <File FileName="src/GraphicObjects/GenericStack.cs" Line="107" Column="7" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
@@ -31,6 +34,7 @@
     <Watch file="src/GraphicObjects/GraphicObject.cs" line="394" offsetX="672" offsetY="1844" expression="pi.Name" liveUpdate="False" />
     <Watch file="src/GraphicObjects/GenericStack.cs" line="108" offsetX="495" offsetY="1377" expression="layoutType" liveUpdate="False" />
     <Watch file="src/Colors.cs" line="148" offsetX="367" offsetY="561" expression="R" liveUpdate="False" />
+    <Watch file="src/GraphicObjects/GraphicObject.cs" line="522" offsetX="531" offsetY="6462" expression="layoutType" liveUpdate="False" />
   </MonoDevelop.Ide.DebuggingService.PinnedWatches>
   <AuthorInfo Name="Jean-Philippe Bruyère" Email="jp_bruyere@hotmail.com" Copyright="jp" Company="" Trademark="" />
 </Properties>
\ No newline at end of file

diff --git a/Templates/CheckBox.goml b/Templates/CheckBox.goml
index f5a6159c3551256d5f1861f4cf52fd24f60ab2b7..799bde1eadebf7809941930bef5522f2e0b29d96 100755 (executable)
--- a/Templates/CheckBox.goml
+++ b/Templates/CheckBox.goml
@@ -3,7 +3,8 @@
        <Image Margin="2" Width="14" Height="14" Path="{../../Image}"  SvgSub="{../../SvgSub}"/>
        <Label Text="{../../Caption}" Height="80" Width="200"/>
 </HorizontalStack>-->
-<HorizontalStack Spacing="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
+<!--<HorizontalStack Spacing="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
        <Image Margin="2" Width="14" Height="14" Path="{../../Image}" SvgSub="{../../SvgSub}"/>
        <Label Text="{../../Caption}" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}"/>
-</HorizontalStack>
\ No newline at end of file
+</HorizontalStack>-->
+<GraphicObject Text="{../Caption}" Height="20" Width="{../TemplatedWidth}"/>
\ No newline at end of file

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 85d7d1dbe839dae38d58cfbf900717ec8fbba961..31761743d0640bc9c3adb3b31aacad7a21acc2fe 100644 (file)
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -37,6 +37,8 @@ namespace test
                int frameCpt = 0;
                int idx = 0;
                string[] testFiles = {
+                       "0.crow",
+                       "testExpandable.goml",
                        "5.crow",
                        "testSpinner.goml",
                        "testScrollbar.goml",
@@ -49,7 +51,6 @@ namespace test
                        "testBorder.goml",
 //                     "testButton2.crow",
                        "test2WayBinding.crow",
-                       "0.crow",
                        "fps.goml",
                        "testTextBox.crow",
                        "testImage.crow",
@@ -60,7 +61,6 @@ namespace test
 //                     "testCombobox.goml",
                        "testWindow3.goml",
                        "testWindow.goml",
-                       "testExpandable.goml",
                        "testCheckbox.goml",
                        "testPopper.goml",
                        "testLabel.goml",

diff --git a/Tests/Interfaces/0.crow b/Tests/Interfaces/0.crow
index aa72d58a1582a8a880f6aac019aa974e6e3efad6..3fbc5e5fab6ebce02bf0133f527e159d7d7db21d 100755 (executable)
--- a/Tests/Interfaces/0.crow
+++ b/Tests/Interfaces/0.crow
@@ -1,8 +1,21 @@
 <?xml version="1.0"?>
-<Border BorderWidth="2" Width="200" Height="200" Foreground="Gray" Margin="10"
-       Background="Green"
-       MouseEnter="{Background=White;Foreground=White}"
-       MouseLeave="{Background=Green;Foreground=Gray}" 
-       >
-       <GraphicObject  Width="100" Height="100" Background="Red" Margin="10"/>
-</Border>
\ No newline at end of file
+<!--<GroupBox Height="-1" Width="0" Margin="5">
+       <VerticalStack  Height="-1" Width="0" >
+               <RadioButton  Caption="Radio 1" Background="Red" Width="0"/>
+               <RadioButton  Caption="Radio 2" IsChecked="true" />
+               <RadioButton  Caption="Radio 3" />
+               <RadioButton  Caption="Radio 1" Background="SkyBlue" Width="0"/>
+       </VerticalStack>
+</GroupBox>-->
+<GroupBox Height="-1" Width="0" Margin="5">
+       <VerticalStack  Height="-1" Width="0" >
+<!--           <RadioButton  Caption="Radio 1" Background="Red" Width="0"/>-->
+               <CheckBox  Caption="Radio 1" Background="Red" Width="0"/>
+<!--           <Button Background="Red" Width="0"/>-->
+<!--                   <Popper  Caption="Radio 1" Background="Red" Width="0"/>-->
+
+<!--           <GraphicObject Height="20" Background="Red" Width="0"/>-->
+<!--           <RadioButton  Caption="Radio 3" />-->
+
+       </VerticalStack>
+</GroupBox>
\ No newline at end of file

diff --git a/Tests/Interfaces/TmpExpandable.goml b/Tests/Interfaces/TmpExpandable.goml
new file mode 100755 (executable)
index 0000000..ee0884f
--- /dev/null
+++ b/Tests/Interfaces/TmpExpandable.goml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!--<VerticalStack Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" MouseClick="../onMouseClick">
+       <Label Text="{../../Caption}" Width="{../../TemplatedWidth}"/>
+       <Container Name="Content" Visible="false" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}"/>
+</VerticalStack>-->
+<Group BorderWidth="1" Foreground="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" 
+               MouseClick="../onMouseClick">
+       <VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
+               <Label Text="{../../../Caption}" Width="{../../../TemplatedWidth}"/>
+               <Container Name="Content" Visible="false" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}"/>
+       </VerticalStack>
+</Group>
\ No newline at end of file

diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index 9824bf40533dfe130a271633c33d214c09b8f655..5a1e7a9787325b23d8ff2cca595f7604d81fc842 100755 (executable)
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -8,6 +8,7 @@
                                <RadioButton  Caption="Radio 1" Background="Red" Width="0"/>
                                <RadioButton  Caption="Radio 2" IsChecked="true" />
                                <RadioButton  Caption="Radio 3" />
+                               <RadioButton  Caption="Radio 1" Background="SkyBlue" Width="0"/>
                        </VerticalStack>
                </GroupBox>
                <HorizontalStack Width="0" Height="-1" Margin="10" CornerRadius="5" 

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index b1700f1e988e0d8a87dff9f801f65b4e7d03cc7a..f744858b1f93c68249467299d1a35a3c21018b48 100644 (file)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -234,6 +234,7 @@
     <EmbeddedResource Include="Interfaces\colorItem.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="Interfaces\TmpExpandable.goml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Crow.csproj">