debug threading with new TemplatedGroup arch, review examples.singleLeveledTemplatedGroup

13 files changed, 58 insertions, 69 deletions

diff --git a/Tests/Interfaces/Divers/0.crow b/Tests/Interfaces/Divers/0.crow
index 055b037e..47f36af5 100755
--- a/Tests/Interfaces/Divers/0.crow
+++ b/Tests/Interfaces/Divers/0.crow
@@ -148,8 +148,8 @@
 		<VerticalStack Width="30%" Margin="5">
 <!--			<Border Margin="5" Height="Fit">
 				<Label Width="Stretched" Margin="1" Text="{../../dv.SelectedItem}"/>
-			</Border>-->
-<!--			<Border Margin="5" Height="30%">
+			</Border>
+			<Border Margin="5" Height="30%">
 				<DirectoryView Name="dv" CurrentDirectory="/" Margin="1"/>
 			</Border>
 			<Splitter/>-->
diff --git a/Tests/Interfaces/GraphicObject/testCtxMenu.crow b/Tests/Interfaces/Divers/testCtxMenu.crow
index 86ebcf2f..edffc70a 100755
--- a/Tests/Interfaces/GraphicObject/testCtxMenu.crow
+++ b/Tests/Interfaces/Divers/testCtxMenu.crow
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<GraphicObject MouseEnter="{Background=Red}" MouseLeave="{Background=Green}" Margin="10" Width="50%" Height="50%" Focusable="true"
+<GraphicObject Margin="10" Width="50%" Height="50%" Focusable="true"
 		Background="hgradient|0:Red|0.25:Blue|0.5:Green|0.75:Yellow|1:Red"
 		MinimumSize="50,50" ContextCommands="{Commands}"/>
\ No newline at end of file
diff --git a/Tests/Interfaces/Divers/testDock.crow b/Tests/Interfaces/Divers/testDock.crow
deleted file mode 100644
index 3dc9a6eb..00000000
--- a/Tests/Interfaces/Divers/testDock.crow
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<Docker Background="Jet" Margin = "0" Focusable="true" >
-	<DockWindow Focusable="true" Caption="View 1" Width="100" Height="100"><GraphicObject Background="Green"/></DockWindow>
-	<DockWindow Focusable="true" Caption="View 2" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Blue"/></DockWindow>
-	<DockWindow Focusable="true" Caption="View 3" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Yellow"/></DockWindow>
-	<DockWindow Focusable="true" Caption="View 4" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Black"/></DockWindow>
-</Docker>
\ No newline at end of file
diff --git a/Tests/Interfaces/Unsorted/testFileDialog.crow b/Tests/Interfaces/Divers/testFileDialog.crow
index 868baf63..868baf63 100644
--- a/Tests/Interfaces/Unsorted/testFileDialog.crow
+++ b/Tests/Interfaces/Divers/testFileDialog.crow
diff --git a/Tests/Interfaces/Divers/testIMLContainer.crow b/Tests/Interfaces/Divers/testIMLContainer.crow
new file mode 100644
index 00000000..2ba5f2cd
--- /dev/null
+++ b/Tests/Interfaces/Divers/testIMLContainer.crow
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<IMLContainer Path="Interfaces/Divers/colorPicker.crow"/>
\ No newline at end of file
diff --git a/Tests/Interfaces/Divers/testImage.crow b/Tests/Interfaces/Divers/testImage.crow
index cfa0f113..eddea8aa 100755
--- a/Tests/Interfaces/Divers/testImage.crow
+++ b/Tests/Interfaces/Divers/testImage.crow
@@ -2,7 +2,7 @@
 <VerticalStack Fit="true">
 	<HorizontalStack Fit="true" Background="hgradient|0:DarkRed|1:Transparent" Margin="5">
 		<Label Text="SCALED PROPORTIONNAL" Width="150"/>
-		<Image Width="50%" Height="Fit" Background="vgradient|0:SkyBlue|1:White" Path="#Tests.image.crow0.svg"/>
+		<Image Width="10%" 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" />
diff --git a/Tests/Interfaces/Divers/welcome.crow b/Tests/Interfaces/Divers/welcome.crow
index c4ec889f..3a08829c 100644
--- a/Tests/Interfaces/Divers/welcome.crow
+++ b/Tests/Interfaces/Divers/welcome.crow
@@ -1,7 +1,21 @@
 <?xml version="1.0"?>
-<VerticalStack Fit="true" VerticalAlignment="Top" Background="0.7,0.7,0.7,0.5"
-	Margin="10" CornerRadius="10">
-	<Label Font="20" Text="Press &lt;F3&gt; to cycle into the examples"/>
-	<Label Font="20" Text="Those are basic tests used to validate changes"/>
-	<Label Font="20" Text="{fps}"/>
-</VerticalStack>
\ No newline at end of file
+<Border BorderStyle="Sunken" Fit="true" Background="0.7,0.7,0.7,0.5" CornerRadius="10">
+	<VerticalStack Margin="20">
+		<Image Path="#Crow.Images.Icons.crow.svg"/>
+<!--		<Label Font="Times bold, 60" Text="C.R.O.W"/>-->
+		<HorizontalStack Fit="true" DataSource="{CrowVersion}" Spacing="0">
+			<Label Foreground="Black" Font="mono, 12" Text="version: "/>		
+			<Label Foreground="Black" Font="mono, 12" Text="{Major}"/>		
+			<Label Foreground="Black" Font="mono, 12" Text="."/>
+			<Label Foreground="Black" Font="mono, 12" Text="{Minor}"/>
+			<Label Foreground="Black" Font="mono, 12" Text="."/>
+			<Label Foreground="Jet" Font="mono, 12" Text="{Build}"/>
+		</HorizontalStack>
+		<GraphicObject Height="30"/>
+		<Label Font="20" Text="Press &lt;F2&gt; and &lt;F3&gt; to cycle into the examples"/>
+		<Label Font="20" Text="Those are basic tests used to validate changes,"/>
+		<GraphicObject Height="30"/>
+		<Label Foreground="Jet" Font="20" Text="&lt;F5&gt; => File dialog example"/>
+		<Label Foreground="Jet" Font="20" Text="&lt;F6&gt; => Window example"/>
+	</VerticalStack>
+</Border>
\ No newline at end of file
diff --git a/Tests/Interfaces/Experimental/testDock.crow b/Tests/Interfaces/Experimental/testDock.crow
new file mode 100644
index 00000000..8a9df9c5
--- /dev/null
+++ b/Tests/Interfaces/Experimental/testDock.crow
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<!--<Docker Background="Jet" Margin = "0" Focusable="true" >
+	<DockWindow Focusable="true" Caption="View 1" Width="100" Height="100"><GraphicObject Background="Green"/></DockWindow>
+	<DockWindow Focusable="true" Caption="View 2" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Blue"/></DockWindow>
+	<DockWindow Focusable="true" Caption="View 3" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Yellow"/></DockWindow>
+	<DockWindow Focusable="true" Caption="View 4" Resizable = "true" Width="100" Height="100"><GraphicObject Background="Black"/></DockWindow>
+</Docker>-->
+<!--<Group Background="Jet" Margin = "0" Focusable="true" >
+	<Window Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Gray}" MouseLeave="{Background=Green}"/></Window>
+	<Window Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></Window>
+	<Window Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></Window>
+	<Window Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></Window>
+</Group>-->
+<Docker Background="Jet" Margin = "0" Focusable="true" >
+	<DockWindow Top="100" Left="100" Focusable="true" Caption="View 1" Width="300" Height="300"><GraphicObject Background="Green" Focusable="true" MouseEnter="{Background=Gray}" MouseLeave="{Background=Green}"/></DockWindow>
+	<DockWindow Top="200" Left="200" Focusable="true" Caption="View 2" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Blue" MouseEnter="{Background=Gray}" MouseLeave="{Background=Blue}"/></DockWindow>
+	<DockWindow Top="300" Left="300" Focusable="true" Caption="View 3" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Yellow" MouseEnter="{Background=Gray}" MouseLeave="{Background=Yellow}"/></DockWindow>
+	<DockWindow Top="400" Left="400" Focusable="true" Caption="View 4" Resizable = "true" Width="300" Height="300"><GraphicObject Focusable="true" Background="Black" MouseEnter="{Background=Gray}" MouseLeave="{Background=Black}"/></DockWindow>
+</Docker>
\ No newline at end of file
diff --git a/Tests/Interfaces/Unsorted/testTypeViewer.goml b/Tests/Interfaces/Experimental/testTypeViewer.goml
index caa454fc..caa454fc 100755
--- a/Tests/Interfaces/Unsorted/testTypeViewer.goml
+++ b/Tests/Interfaces/Experimental/testTypeViewer.goml
diff --git a/Tests/Interfaces/TemplatedContainer/testTabView.crow b/Tests/Interfaces/TemplatedContainer/testTabView.crow
index f9934007..c6cc043b 100644
--- a/Tests/Interfaces/TemplatedContainer/testTabView.crow
+++ b/Tests/Interfaces/TemplatedContainer/testTabView.crow
@@ -31,5 +31,5 @@
 		</TabItem>
 	</TabView>
 	<Button Background="vgradient|0:DimGray|1:Black" HorizontalAlignment="Right"
-		Caption="Add new tab" Width="Fit" Height="30" MouseClick="onAddTabButClick"/>
+		Caption="Add new tab" Width="Fit" Height="30" MouseDown="onAddTabButClick"/>
 </VerticalStack>
diff --git a/Tests/Interfaces/TemplatedContainer/testTreeView.crow b/Tests/Interfaces/TemplatedContainer/testTreeView.crow
index 9d58cda6..099ce66d 100755
--- a/Tests/Interfaces/TemplatedContainer/testTreeView.crow
+++ b/Tests/Interfaces/TemplatedContainer/testTreeView.crow
@@ -1,40 +1,4 @@
 <?xml version="1.0"?>
-<TreeView IsRoot="true" Name="treeView" Data="{CurDirectory}" Background="DimGray">
-	<ItemTemplate DataType="System.IO.FileInfo">
-		<HorizontalStack Focusable="true"  Height="Fit" Width="Stretched"  >
-			<Image Margin="2" Width="14" Height="14"
-				Path="#Crow.Images.Icons.file.svg"/>
-			<Label Text="{Name}" Width="Stretched"
-				MouseEnter="{Background=hgradient|0:BlueCrayola|1:Transparent}"
-				MouseLeave="{Background=Transparent}"/>
-		</HorizontalStack>
-	</ItemTemplate>
-	<ItemTemplate DataType="System.IO.DirectoryInfo" Data="GetFileSystemInfos">
-		<Expandable Caption="{Name}" >
-			<Template>
-				<VerticalStack>
-					<HorizontalStack Spacing="1" Height="Fit"
-							MouseEnter="{Background=hgradient|0:BlueCrayola|1:Transparent}"
-							MouseLeave="{Background=Transparent}">
-						<Image Margin="2" Width="12" Height="12"
-							Visible="{./HasContent}"
-							Path="{./Image}"
-							SvgSub="{./IsExpanded}"/>
-						<Image Margin="2" Width="14" Height="14"
-							Path="#Crow.Images.Icons.folder.svg"/>
-						<Label Text="{./Caption}"/>
-					</HorizontalStack>
-					<Container Name="Content" Visible="false"/>
-				</VerticalStack>
-			</Template>
-			<HorizontalStack Height="Fit">
-				<GraphicObject Width="12" Height="10"/>
-				<TreeView Name="List" Height="Fit">
-					<Template>
-						<VerticalStack Height="Fit" Name="ItemsContainer"/>
-					</Template>
-				</TreeView>
-			</HorizontalStack>
-		</Expandable>
-	</ItemTemplate>
-</TreeView>
+<Border Margin="5" Height="90%" Width="50%">
+	<DirectoryView Name="dv" CurrentDirectory="/" Margin="1"/>
+</Border>
\ No newline at end of file
diff --git a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
index 65b77d79..54ccde15 100755
--- a/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
+++ b/Tests/Interfaces/TemplatedControl/testItemTemplateTag.crow
@@ -6,16 +6,15 @@
 			<Template>
 				<Border BorderWidth="1">
 					<HorizontalStack Margin="1">
-						<Scroller Name="scroller1"
+						<Scroller Name="scroller1" 
 								Margin="2" VerticalScrolling="true" ScrollY="{../scrollbar1.Value}">
 							<VerticalStack Height="Fit" MinimumSize="10,10"
-								Name="ItemsContainer" Margin="0"
-								VerticalAlignment="Top"
-								HorizontalAlignment="Left"/>
+								Name="ItemsContainer" Margin="0" VerticalAlignment="Top"/>
 						</Scroller>
-						<ScrollBar Name="scrollbar1" Value="{../scroller1.ScrollY}"
-							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical"
-							Width="14"/>
+						<ScrollBar Name="scrollbar1" Value="{²../scroller1.ScrollY}"
+							LargeIncrement="{../scroller1.PageHeight}" SmallIncrement="30" CursorSize="{../scroller1.ChildHeightRatio}"
+							Maximum="{../scroller1.MaximumScroll}" Orientation="Vertical" 
+							Width="14" />
 					</HorizontalStack>
 				</Border>
 			</Template>
@@ -31,8 +30,8 @@
 			</ItemTemplate>
 		</ListBox>
 		<HorizontalStack Fit="true" HorizontalAlignment="Right">
-			<Button Caption="Load list" MouseClick="OnLoadList"/>
-			<Button Caption="Clear" MouseClick="OnClear"/>
+			<Button Caption="Load list" MouseDown="OnLoadList"/>
+			<Button Caption="Clear" MouseDown="OnClear"/>
 		</HorizontalStack>
 	</VerticalStack>
 </Border>
diff --git a/Tests/Interfaces/TemplatedControl/testSpinner.crow b/Tests/Interfaces/TemplatedControl/testSpinner.crow
index 09f618be..07d62e65 100755
--- a/Tests/Interfaces/TemplatedControl/testSpinner.crow
+++ b/Tests/Interfaces/TemplatedControl/testSpinner.crow
@@ -3,10 +3,8 @@
 	Margin="20" Background="DarkGray">
 
 	<HorizontalStack Fit="true" Margin="5" Background="SkyBlue">
-		<Spinner Value="{IntValue}" ValueChanged="onSpinnerValueChange"/>
+		<Spinner Name="sp1" Value="5" ValueChanged="onSpinnerValueChange"/>
 		<Spinner Value="5"/>
 		<Spinner Value="5"/>
-		<Button/>
 	</HorizontalStack>
-	<IMLContainer Path="Interfaces/Divers/colorPicker.crow"/>
 </VerticalStack>
\ No newline at end of file