update test before changes

diff --git a/Crow.csproj b/Crow.csproj
index a9a61f18f10f7eb4a28ab7212a91bbd862b79763..28e935da66cadbec03b6670f31cb2e5b470027cf 100644 (file)
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -23,18 +23,24 @@
     <Description>Crow project description</Description>
     <BaseAddress>4194304</BaseAddress>
     <ReleaseVersion>0.4</ReleaseVersion>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
-    <DefineConstants>DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
+    <DefineConstants>DEBUG_FOCUS0;DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
     <Optimize>false</Optimize>
+    <IntermediateOutputPath>$(SolutionDir)\build\obj\$(Configuration)</IntermediateOutputPath>
+    <OutputPath>$(SolutionDir)\build\$(Configuration)</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>True</Optimize>
     <DebugType>None</DebugType>
     <DefineConstants>__linux__;MEASURE_TIME</DefineConstants>
+    <IntermediateOutputPath>$(SolutionDir)\build\obj\$(Configuration)</IntermediateOutputPath>
+    <OutputPath>$(SolutionDir)\build\$(Configuration)</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="src\Colors.cs" />

diff --git a/OTKCrow/OpenTKGameWindow.cs b/OTKCrow/OpenTKGameWindow.cs
index efe0d94150dc8ac72188e2ef1b3f8627b1d5847a..0b5c8543872cdece1cb01af77e4d37946dbfa692 100644 (file)
--- a/OTKCrow/OpenTKGameWindow.cs
+++ b/OTKCrow/OpenTKGameWindow.cs
@@ -190,6 +190,7 @@ namespace Crow
                        GL.Disable (EnableCap.DepthTest);
 
                        shader.Enable ();
+                       GL.ActiveTexture (TextureUnit.Texture0);
                        GL.BindTexture (TextureTarget.Texture2D, texID);
                        lock (CrowInterface.RenderMutex) {
                                if (CrowInterface.IsDirty) {
@@ -284,6 +285,7 @@ namespace Crow
                                this.ClientRectangle.Width,
                                this.ClientRectangle.Height));
                        createContext ();
+                       GL.Viewport (0, 0, ClientRectangle.Width, ClientRectangle.Height);
                }
                #endregion
 
@@ -319,12 +321,12 @@ namespace Crow
                #region keyboard Handling
                void Keyboard_KeyDown(object sender, OpenTK.Input.KeyboardKeyEventArgs otk_e)
                {
-                       if (!CrowInterface.ProcessKeyDown((int)otk_e.Key))
+                       //if (!CrowInterface.ProcessKeyDown((int)otk_e.Key))
                                KeyboardKeyDown.Raise (this, otk_e);
         }
                void Keyboard_KeyUp(object sender, OpenTK.Input.KeyboardKeyEventArgs otk_e)
                {
-                       if (!CrowInterface.ProcessKeyUp((int)otk_e.Key))
+                       //if (!CrowInterface.ProcessKeyUp((int)otk_e.Key))
                                KeyboardKeyUp.Raise (this, otk_e);
                }
                void OpenTKGameWindow_KeyPress (object sender, OpenTK.KeyPressEventArgs e)

diff --git a/Templates/ComboBox.goml b/Templates/ComboBox.goml
index a114bed8d696ab708523b621f268c33cc7b59733..d7b2cab57217789fa0418893f0711086493301a9 100755 (executable)
--- a/Templates/ComboBox.goml
+++ b/Templates/ComboBox.goml
@@ -16,12 +16,12 @@
        <Border Background="DimGray" BorderWidth="1" Margin="1"         
                Fit="true">
                <Scroller  Name="scroller1" Margin="2" VerticalScrolling="true"
-                       MinimumSize="{../../../MinimumPopupSize}" MaximumSize="0;400"
-                       Fit="true"
+                       MinimumSize="{../../../MinimumPopupSize}" MaximumSize="0;200"
+                       Height="{../../../HeightPolicy}" Width="{../../../WidthPolicy}"
                        HorizontalAlignment="Left"
                        ValueChanged="../../../_scroller_ValueChanged">
                        <VerticalStack LayoutChanged="../../../../_list_LayoutChanged"
-                               Height="-1" Width="{../WidthPolicy}" Name="List" Margin="0"
+                               Height="Fit" Width="{../WidthPolicy}" Name="List" Margin="0"
                                HorizontalAlignment="Left"
                                VerticalAlignment="Top"/>
                </Scroller>

diff --git a/Templates/Window.goml b/Templates/Window.goml
index 6de6638394968789ec77e10ea1031f0a5b4b3cd4..3acb51abe2aa04b05d868ce33b1718a395b30c64 100755 (executable)
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -1,9 +1,12 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../HeightPolicy}" Width="{../WidthPolicy}">
+<Border BorderWidth="1" Foreground="White" CornerRadius="20" Height="{../HeightPolicy}" Width="{../WidthPolicy}"
+                               MouseEnter="../onBorderMouseEnter"
+                               MouseLeave="../onBorderMouseLeave">
        <VerticalStack Height="{../../HeightPolicy}" Width="{../../WidthPolicy}">
                <Border Name="TitleBar" BorderWidth="1" Foreground="White" Width="{../../../WidthPolicy}" Height="Fit"
                                Background="vgradient|0:0,1;0,5;1,0;0,5|1:0,0;0,1;0,3;0,9">
-                       <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="Fit" >
+                       <HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../WidthPolicy}" Height="Fit" 
+                               >
                                <GraphicObject Width="5"/>
                                <Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
                                <Label Foreground="White" Width="{../../../../../WidthPolicy}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />

diff --git a/Tests/GOLIBTestsOTK.cs b/Tests/GOLIBTestsOTK.cs
index 4bb7aa94fb49217c0e692a4d9aaba979e5f790d0..ec8fd6901ec4da502076f54925adcf7fa65dcabb 100644 (file)
--- a/Tests/GOLIBTestsOTK.cs
+++ b/Tests/GOLIBTestsOTK.cs
@@ -13,6 +13,7 @@ using Crow;
 using System.Threading;
 using System.Collections.Generic;
 using System.Linq;
+using System.IO;
 
 
 namespace testOTK
@@ -29,63 +30,7 @@ namespace testOTK
                int frameCpt = 0;
                int idx = 0;
 
-               string[] testFiles = {
-//                     "testTabView.crow",
-                       "testCombobox.goml",
-                       "testWindow.goml",
-                       @"basicTests/5.crow",
-                       "testColorList.crow",
-                       @"basicTests/0.crow",
-                       @"basicTests/4.crow",
-                       @"basicTests/1.crow",
-                       @"basicTests/2.crow",
-                       "test0.goml",
-                       "test1.goml",
-                       "0.crow",
-                       "0.crow",
-                       "testCheckbox.goml",
-                       "fps.goml",
-                       "testExpandable.goml",
-                       "0.crow",
-                       "testImage.crow",
-                       "testOutOfClipUpdate.crow",
-//                     "test_Listbox.goml",
-//                     "testTreeView.crow",
-                       "1.crow",
-                       "clip4.crow",
-                       "clip3.crow",
-                       "clip2.crow",
-                       "clip0.crow",
-                       "clip1.crow",
-//                     "5.crow",
-//                     "testCombobox.goml",
-//                     "testPopper.goml",
-                       "testTextBox.crow",
-
-                       "4.crow",
-                       "testSpinner.goml",
-                       "testScrollbar.goml",
-                       "testGroupBox.goml",
-                       "testGrid.goml",
-                       "testButton.crow",
-                       "testBorder.goml",
-//                     "testButton2.crow",
-                       "test2WayBinding.crow",
-                       "test4.goml",
-                       "2.crow",
-                       "test1.goml",
-                       "testWindow2.goml",
-
-                       "testWindow3.goml",
-                       "testLabel.goml",
-                       "testAll.goml",
-//                     "testSpinner.goml",
-//                     "testRadioButton2.goml",
-                       "testContainer.goml",
-                       "testRadioButton.goml",
-                       "testMsgBox.goml",
-//                     "testMeter.goml",
-               };
+               string[] testFiles;
 
 
                public int intValue = 25;
@@ -146,7 +91,13 @@ namespace testOTK
                        //this.AddWidget(new test4());
                        KeyboardKeyDown += GOLIBTests_KeyboardKeyDown1;;
 
-                       GraphicObject obj = CrowInterface.LoadInterface("Interfaces/" + testFiles[idx]);
+
+                       testFiles = Directory.GetFiles(@"Interfaces/Stack", "*.crow").ToArray();
+                       testFiles = Directory.GetFiles(@"Interfaces/GraphicObject", "*.crow").Concat(testFiles).ToArray();
+                       testFiles = Directory.GetFiles(@"Interfaces/Container", "*.crow").Concat(testFiles).ToArray();
+                       //testFiles = Directory.GetFiles(@"Interfaces", "*.crow").Concat(testFiles).ToArray();
+
+                       GraphicObject obj = CrowInterface.LoadInterface(testFiles[5]);
                        obj.DataSource = this;
 
                }
@@ -169,7 +120,7 @@ namespace testOTK
                        if (idx == testFiles.Length)
                                idx = 0;
                        this.Title = testFiles [idx];
-                       GraphicObject obj = CrowInterface.LoadInterface("Interfaces/" + testFiles[idx]);
+                       GraphicObject obj = CrowInterface.LoadInterface(testFiles[idx]);
                        obj.DataSource = this;
                }
 

diff --git a/Tests/Interfaces/2.crow b/Tests/Interfaces/2.crow
index 1bd3761df5d1526ff29b56ad50fb2f4a211966f9..99ff0424e7c9ae85ab8c427fb385661158fd2c48 100755 (executable)
--- a/Tests/Interfaces/2.crow
+++ b/Tests/Interfaces/2.crow
@@ -30,5 +30,5 @@
 <!--           <ComboBox/>-->
        </HorizontalStack>
        <MessageBox></MessageBox>
-       <Window><Label/></Window>
+<!--   <Window><Label/></Window>-->
 </VerticalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/Container/0.crow b/Tests/Interfaces/Container/0.crow
new file mode 100755 (executable)
index 0000000..eec3a76
--- /dev/null
+++ b/Tests/Interfaces/Container/0.crow
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<Container Background="Onyx" Margin="10" Width="90%" Height="90%">
+       <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="Mantis"
+                       MinimumSize="50;50"/>
+</Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/Container/1.crow b/Tests/Interfaces/Container/1.crow
new file mode 100755 (executable)
index 0000000..274d906
--- /dev/null
+++ b/Tests/Interfaces/Container/1.crow
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<Container Background="Onyx" Margin="10" Width="90%" Height="90%">
+       <GraphicObject Margin="10" Width="50%" Height="50%" Background="Mantis"
+                       MinimumSize="50;50"/>
+</Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/Container/2.crow b/Tests/Interfaces/Container/2.crow
new file mode 100755 (executable)
index 0000000..c619cb7
--- /dev/null
+++ b/Tests/Interfaces/Container/2.crow
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<Container Background="Onyx" Margin="10" Fit="true">
+       <GraphicObject Margin="10" Width="50%" Height="50%" Background="Mantis"
+                       MinimumSize="50;50"/>
+</Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/GraphicObject/0.crow b/Tests/Interfaces/GraphicObject/0.crow
new file mode 100755 (executable)
index 0000000..6185bd7
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/0.crow
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="Mantis"
+               MinimumSize="50;50"/>
\ No newline at end of file

diff --git a/Tests/Interfaces/GraphicObject/1.crow b/Tests/Interfaces/GraphicObject/1.crow
new file mode 100755 (executable)
index 0000000..262fc24
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/1.crow
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<GraphicObject Margin="10" Width="150" Height="150" Background="Mantis"
+               MinimumSize="50;50"/>
\ No newline at end of file

diff --git a/Tests/Interfaces/GraphicObject/2.crow b/Tests/Interfaces/GraphicObject/2.crow
new file mode 100755 (executable)
index 0000000..dfd10ab
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/2.crow
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<GraphicObject Margin="10" Width="50%" Height="50%" Background="Mantis"
+               MinimumSize="50;50"/>
\ No newline at end of file

diff --git a/Tests/Interfaces/GraphicObject/4.crow b/Tests/Interfaces/GraphicObject/4.crow
new file mode 100755 (executable)
index 0000000..f696a9e
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/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/GraphicObject/5.crow b/Tests/Interfaces/GraphicObject/5.crow
new file mode 100755 (executable)
index 0000000..4922474
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/5.crow
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<HorizontalStack Width="Stretched" Height="Fit" Margin="5" Background="Mantis">
+       <GraphicObject Background="Carmine" Width="10%" Height="20"/>
+       <GraphicObject Background="Carmine" Width="Stretched" Height="20"/>
+       <GraphicObject Background="Carmine" Width="10%" Height="20"/>
+       <GraphicObject Background="Carmine" Width="10%" Height="20"/>
+       <GraphicObject Background="Carmine" Width="10%" Height="20"/>
+       <GraphicObject Background="Carmine" Width="10%" Height="20"/>
+       <GraphicObject Background="Carmine" Width="10%" Height="20"/>
+</HorizontalStack>

diff --git a/Tests/Interfaces/GraphicObject/6.crow b/Tests/Interfaces/GraphicObject/6.crow
new file mode 100755 (executable)
index 0000000..c37ca36
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/6.crow
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<VerticalStack Fit="true" Background="DimGray" Margin="5">
+<!--   <RadioButton/>-->
+       <Label Text="a" Width="Stretched" Background="Red"/>
+       <Label Text="{fps}" HorizontalAlignment="Right" Background="LimeGreen"/>
+</VerticalStack>

diff --git a/Tests/Interfaces/GraphicObject/7.crow b/Tests/Interfaces/GraphicObject/7.crow
new file mode 100755 (executable)
index 0000000..d8e9cd3
--- /dev/null
+++ b/Tests/Interfaces/GraphicObject/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/Stack/0.crow b/Tests/Interfaces/Stack/0.crow
new file mode 100755 (executable)
index 0000000..a178d8c
--- /dev/null
+++ b/Tests/Interfaces/Stack/0.crow
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<VerticalStack MinimumSize="50;50" Background="Onyx" Margin="10" Width="90%" Height="90%">
+       <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="Mantis"
+                       MinimumSize="10;10"/>
+</VerticalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/Stack/1.crow b/Tests/Interfaces/Stack/1.crow
new file mode 100755 (executable)
index 0000000..c2423ef
--- /dev/null
+++ b/Tests/Interfaces/Stack/1.crow
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<VerticalStack Background="Onyx" Margin="10" Width="90%" Height="90%">
+       <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="Mantis"
+                       MinimumSize="10;10"/>
+</VerticalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/Stack/2.crow b/Tests/Interfaces/Stack/2.crow
new file mode 100755 (executable)
index 0000000..5f23a7d
--- /dev/null
+++ b/Tests/Interfaces/Stack/2.crow
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<VerticalStack Background="Onyx" Margin="10" Width="90%" Height="90%">
+       <GraphicObject Margin="10" Width="Stretched" Height="20%" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="20%" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="20%" Background="Mantis"
+                       MinimumSize="10;10"/>
+</VerticalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/Stack/3.crow b/Tests/Interfaces/Stack/3.crow
new file mode 100755 (executable)
index 0000000..0c3987f
--- /dev/null
+++ b/Tests/Interfaces/Stack/3.crow
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<VerticalStack Background="Onyx" Margin="10" Width="90%" Height="90%">
+       <GraphicObject Margin="10" Width="Stretched" Height="Fit" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="Mantis"
+                       MinimumSize="10;10"/>
+       <GraphicObject Margin="10" Width="Stretched" Height="Stretched" Background="Mantis"
+                       MinimumSize="10;10"/>
+</VerticalStack>
\ No newline at end of file

diff --git a/Tests/Interfaces/basicTests/5.1.crow b/Tests/Interfaces/basicTests/5.1.crow
new file mode 100755 (executable)
index 0000000..7a86275
--- /dev/null
+++ b/Tests/Interfaces/basicTests/5.1.crow
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<VerticalStack Height="Stretched" Width="Fit" Margin="5" Background="Mantis">
+       <GraphicObject Background="Carmine" Height="10%" Width="20"/>
+       <GraphicObject Background="Carmine" Height="Stretched" Width="20"/>
+       <GraphicObject Background="Carmine" Height="10%" Width="20"/>
+       <GraphicObject Background="Carmine" Height="10%" Width="20"/>
+       <GraphicObject Background="Carmine" Height="10%" Width="20"/>
+       <GraphicObject Background="Carmine" Height="10%" Width="20"/>
+       <GraphicObject Background="Carmine" Height="10%" Width="20"/>
+</VerticalStack>

diff --git a/Tests/Interfaces/basicTests/6.crow b/Tests/Interfaces/basicTests/6.crow
index 829c39f48021c1207e09de506812b420537402d1..c37ca360ca4a663e47d2be0ecf8fdef9e2c3e3a4 100755 (executable)
--- a/Tests/Interfaces/basicTests/6.crow
+++ b/Tests/Interfaces/basicTests/6.crow
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <VerticalStack Fit="true" Background="DimGray" Margin="5">
 <!--   <RadioButton/>-->
-       <Label Text="a" Width="0" Background="Red"/>
+       <Label Text="a" Width="Stretched" Background="Red"/>
        <Label Text="{fps}" HorizontalAlignment="Right" Background="LimeGreen"/>
 </VerticalStack>

diff --git a/Tests/Interfaces/colorItem.crow b/Tests/Interfaces/colorItem.crow
index c096e77a0871627b3a0f44e9b07770e4fda2e910..3c30a05257655ec93be3d0d662829894cd36451c 100755 (executable)
--- a/Tests/Interfaces/colorItem.crow
+++ b/Tests/Interfaces/colorItem.crow
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <HorizontalStack
                        HorizontalAlignment="Left"
-                       Height="Fit" Width="Stretched" Margin="1" Focusable="true"
+                       Height="Fit" Width="200" Margin="1" Focusable="true"
                        MouseEnter="{Background=hgradient|0:DarkRed|1:Transparent}"
                        MouseLeave="{Background=Transparent}">
        <GraphicObject Height="12" Width="20" Background="{}" Margin="0" CornerRadius="3"/>

diff --git a/Tests/Interfaces/testCombobox.goml b/Tests/Interfaces/testCombobox.goml
index a87b10f38453149a97f276f29ac2fc7154dcc5e0..0c72cf0e5770a384550610b96aad4fb47da2d486 100755 (executable)
--- a/Tests/Interfaces/testCombobox.goml
+++ b/Tests/Interfaces/testCombobox.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<VerticalStack Width="200">
-       <ComboBox Width="Stretched" Data="{TestList}" SelectedIndex="0"
+<Container Background="Onyx">
+       <ComboBox Width="200" Data="{TestList}" SelectedIndex="0" Background="Mantis"
                ItemTemplate="#Tests.Interfaces.colorItem.crow"/>
-</VerticalStack>
\ No newline at end of file
+</Container>
\ No newline at end of file

diff --git a/Tests/Interfaces/testImage.crow b/Tests/Interfaces/testImage.crow
index 83d9de6a2ba4be413b31022ca6de984369d3eb7c..46ffdcb6406f4f9f1cb6b8530f38087f913ab375 100755 (executable)
--- a/Tests/Interfaces/testImage.crow
+++ b/Tests/Interfaces/testImage.crow
@@ -2,8 +2,8 @@
 <VerticalStack Fit="true">
        <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
                <Label Text="SCALED PROPORTIONNAL" Width="150"/>
-               <Image Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg"/>
-               <Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
+               <Image Width="50%" Height="Fit" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg"/>
+<!--           <Image Margin="10" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
                <Image Background="vgradient|0:SkyBlue|1:White" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
                <Image Margin="2" Background="vgradient|0:SkyBlue|1:White" Width="20" Height="20" Path="#Tests.image.crow0.svg" />
                <Image Background="vgradient|0:SkyBlue|1:White" Width="50" Height="100" Path="#Tests.image.crow0.svg" />
@@ -11,9 +11,9 @@
                <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="Fit" Path="#Tests.image.crow0.svg" />
-               <Image Margin="10" 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">
+<!--   <HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
                <Label Text="SCALED NOT PROPORTIONNAL" Width="150"/>
                <Image KeepProportions="false" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
                <Image KeepProportions="false" Margin="10" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg" />
@@ -83,5 +83,5 @@
                <Image Margin="10" Background="White" Path="#Tests.image.crow0.svg" />
                <Image Background="White" Width="20" Height="10" Path="#Tests.image.crow0.svg" />
                <Image Margin="1" Background="White" Width="20" Height="10" Path="#Tests.image.crow0.svg" />
-       </HorizontalStack>
+       </HorizontalStack>-->
 </VerticalStack>
\ No newline at end of file

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 3f8087270f5d52c2b6de4081d4ed045bdfa1aec3..143f80bea5f8b4daa96d17c7b840720d012cccf6 100644 (file)
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -62,12 +62,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Interfaces\testBorder.goml.cs" />
-    <Compile Include="..\bin\Debug\Interfaces\testContainer.goml.cs">
-      <Link>Interfaces\testContainer.goml.cs</Link>
-    </Compile>
-    <Compile Include="..\bin\Debug\Interfaces\test_stack.goml.cs">
-      <Link>Interfaces\test_stack.goml.cs</Link>
-    </Compile>
     <Compile Include="GOLIBTestsOTK.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -283,11 +277,42 @@
     <None Include="Interfaces\basicTests\7.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\GraphicObject\0.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\GraphicObject\1.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\GraphicObject\2.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Container\0.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Container\1.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Container\2.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Stack\0.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Stack\1.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Stack\2.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\Stack\3.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
     <Folder Include="image\" />
     <Folder Include="Interfaces\basicTests\" />
+    <Folder Include="Interfaces\GraphicObject\" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="image\tetra.png" />

diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs
index 455ed928127c2c768a777f28ea7eb673df4978cc..dd385201ed06f49e89a3c1c924625d87d8f5579c 100644 (file)
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/GenericStack.cs
@@ -218,6 +218,8 @@ namespace Crow
                {
                        base.OnChildLayoutChanges (sender, arg);
 
+                       GraphicObject go = sender as GraphicObject;
+
                        switch (arg.LayoutType) {
                        case LayoutingType.Width:
                                if (Orientation == Orientation.Horizontal) {

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 4e230d4fc19d5858ab30f73fd893d69094742549..e4d17351dcfed28c348649d4fb229e2fdd95a783 100644 (file)
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -747,7 +747,7 @@ namespace Crow
                                if (Left == 0) {
 
                                        if (Parent.RegisteredLayoutings.HasFlag (LayoutingType.Width) ||
-                                               RegisteredLayoutings.HasFlag (LayoutingType.Width))
+                                           RegisteredLayoutings.HasFlag (LayoutingType.Width))
                                                return false;
 
                                        switch (HorizontalAlignment) {
@@ -763,21 +763,12 @@ namespace Crow
                                        }
                                } else
                                        Slot.X = Left;
-
-                               if (LastSlots.X == Slot.X)
-                                       break;
-
-                               bmp = null;
-
-                               OnLayoutChanges (layoutType);
-
-                               LastSlots.X = Slot.X;
                                break;
                        case LayoutingType.Y:
                                if (Top == 0) {
 
                                        if (Parent.RegisteredLayoutings.HasFlag (LayoutingType.Height) ||
-                                               RegisteredLayoutings.HasFlag (LayoutingType.Height))
+                                           RegisteredLayoutings.HasFlag (LayoutingType.Height))
                                                return false;
 
                                        switch (VerticalAlignment) {
@@ -791,17 +782,8 @@ namespace Crow
                                                Slot.Y = Parent.ClientRectangle.Height / 2 - Slot.Height / 2;
                                                break;
                                        }
-                               }else
+                               } else
                                        Slot.Y = Top;
-
-                               if (LastSlots.Y == Slot.Y)
-                                       break;
-
-                               bmp = null;
-
-                               OnLayoutChanges (layoutType);
-
-                               LastSlots.Y = Slot.Y;
                                break;
                        case LayoutingType.Width:
                                if (Width.IsFixed)
@@ -813,7 +795,7 @@ namespace Crow
                                else if (Width == Measure.Stretched)
                                        Slot.Width = Parent.ClientRectangle.Width;
                                else
-                                       Slot.Width = (int)Math.Round((double)(Parent.ClientRectangle.Width * Width) / 100.0);
+                                       Slot.Width = (int)Math.Round ((double)(Parent.ClientRectangle.Width * Width) / 100.0);
 
                                if (Slot.Width < 0)
                                        return false;
@@ -826,15 +808,6 @@ namespace Crow
                                        Slot.Width = MaximumSize.Width;
                                        NotifyValueChanged ("WidthPolicy", Measure.Stretched);
                                }
-
-                               if (LastSlots.Width == Slot.Width)
-                                       break;
-
-                               bmp = null;
-
-                               OnLayoutChanges (layoutType);
-
-                               LastSlots.Width = Slot.Width;
                                break;
                        case LayoutingType.Height:
                                if (Height.IsFixed)
@@ -846,7 +819,7 @@ namespace Crow
                                else if (Height == Measure.Stretched)
                                        Slot.Height = Parent.ClientRectangle.Height;
                                else
-                                       Slot.Height = (int)Math.Round((double)(Parent.ClientRectangle.Height * Height) / 100.0);
+                                       Slot.Height = (int)Math.Round ((double)(Parent.ClientRectangle.Height * Height) / 100.0);
 
                                if (Slot.Height < 0)
                                        return false;
@@ -859,23 +832,61 @@ namespace Crow
                                        Slot.Height = MaximumSize.Height;
                                        NotifyValueChanged ("HeightPolicy", Measure.Stretched);
                                }
+                               break;
+                       }
 
-                               if (LastSlots.Height == Slot.Height)
+                       updateSlot (layoutType);
+
+                       //if no layouting remains in queue for item, registre for redraw
+                       if (this.registeredLayoutings == LayoutingType.None && bmp == null)
+                               this.AddToRedrawList ();
+
+                       return true;
+               }
+               protected void updateSlot(LayoutingType layoutType)
+               {
+                       switch (layoutType) {
+                       case LayoutingType.X:
+                               if (LastSlots.X == Slot.X)
                                        break;
 
                                bmp = null;
 
                                OnLayoutChanges (layoutType);
 
-                               LastSlots.Height = Slot.Height;
+                               LastSlots.X = Slot.X;                           
                                break;
-                       }
+                       case LayoutingType.Y:
+                               if (LastSlots.Y == Slot.Y)
+                                       break;
 
-                       //if no layouting remains in queue for item, registre for redraw
-                       if (this.registeredLayoutings == LayoutingType.None && bmp == null)
-                               this.AddToRedrawList ();
+                               bmp = null;
 
-                       return true;
+                               OnLayoutChanges (layoutType);
+
+                               LastSlots.Y = Slot.Y;                           
+                               break;
+                       case LayoutingType.Width:
+                               if (LastSlots.Width == Slot.Width)
+                                       break;
+
+                               bmp = null;
+
+                               OnLayoutChanges (layoutType);
+
+                               LastSlots.Width = Slot.Width;                           
+                               break;
+                       case LayoutingType.Height:
+                               if (LastSlots.Height == Slot.Height)
+                                       break;
+
+                               bmp = null;
+
+                               OnLayoutChanges (layoutType);
+
+                               LastSlots.Height = Slot.Height;                         
+                               break;
+                       }
                }
                #endregion