wip

21 files changed, 348 insertions, 46 deletions

diff --git a/Samples/common/Editor.cs b/Samples/common/Editor.cs
index 1b5d337b..95de4569 100644
--- a/Samples/common/Editor.cs
+++ b/Samples/common/Editor.cs
@@ -72,8 +72,8 @@ namespace Crow
 			Tokenizer tokenizer = new Tokenizer();
 			Tokens = tokenizer.Tokenize (Source);
 
-			foreach (Token t in Tokens)
-				Console.WriteLine ($"{t,-40} {Source.AsSpan(t.Start, t.Length).ToString()}");
+			/*foreach (Token t in Tokens)
+				Console.WriteLine ($"{t,-40} {Source.AsSpan(t.Start, t.Length).ToString()}");*/
 		}
 		public class TokenizerException : Exception {
 			public readonly int Position;
diff --git a/Samples/common/ui/Interfaces/Divers/fitListWithStretchedItems.crow b/Samples/common/ui/Interfaces/Divers/fitListWithStretchedItems.crow
new file mode 100644
index 00000000..c2342c6b
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Divers/fitListWithStretchedItems.crow
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+
+<ListBox Data="{TestList}" Width="Fit" >
+	<Template>
+		<Scroller Height="Stretched" Background="DarkRed" Margin="1">
+			<VerticalStack Name="ItemsContainer" Orientation="Horizontal" VerticalAlignment="Top" Height="Fit" Background="Grey" Margin="20"/>
+		</Scroller>
+	</Template>
+	<ItemTemplate>
+		<!--<Label Text="{}" TextAlignment="Center" Font="mono, 9" Foreground="Black" Margin="10" Width="Stretched" Background="{}"/>-->
+		<Label Text="{}" TextAlignment="Center" Font="mono, 9" Foreground="Black" Margin="10" Background="{}" Width="Stretched" />
+	</ItemTemplate>
+
+</ListBox>
+
diff --git a/Samples/common/ui/Interfaces/Divers/progress.crow b/Samples/common/ui/Interfaces/Divers/progress.crow
new file mode 100644
index 00000000..b4086cd6
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Divers/progress.crow
@@ -0,0 +1,11 @@
+<HorizontalStack Margin="0" Height="Fit" Visible="{ProgressVisible}">
+	<ProgressBar Value="50" Maximum="100" Caption="Progress caption" Width="Stretched" Height="Fit">
+		<Template>
+			<Group>
+				<Gauge Background="DarkGrey" Foreground="RoyalBlue" Height="Stretched"
+						Orientation="{./Orientation}" Minimum="{./Minimum}" Maximum="{./Maximum}" Value="{./Value}"/>
+				<Label Foreground="White" Text="{ProgressMessage}" Width="Stretched" Margin="3" Background="Transparent" Height="Fit"/>
+			</Group>
+		</Template>
+	</ProgressBar>
+</HorizontalStack>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Divers/splitterWithScrollBar.crow b/Samples/common/ui/Interfaces/Divers/splitterWithScrollBar.crow
new file mode 100644
index 00000000..2c213ff9
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Divers/splitterWithScrollBar.crow
@@ -0,0 +1,9 @@
+<HorizontalStack Margin="50">
+	<VerticalStack Height="Stretched" Width="33%" Background="SeaGreen">
+		<DirectoryView Margin="1" Name="dv" CurrentDirectory="{CurrentDir}" SelectedItemChanged="Dv_SelectedItemChanged"/>
+	</VerticalStack>
+	<Splitter/>
+	<Label Text="{/Width}" Height="Stretched" Background="SeaGreen" Width="33%" Margin="5"/>
+	<Splitter/>
+	<Label Text="{/Width}" Height="Stretched" Background="SeaGreen" Width="Stretched" Margin="5"/>
+</HorizontalStack>
diff --git a/Samples/common/ui/Interfaces/Experimental/menu.crow b/Samples/common/ui/Interfaces/Experimental/menu.crow
index 19db1943..6c916bd9 100644
--- a/Samples/common/ui/Interfaces/Experimental/menu.crow
+++ b/Samples/common/ui/Interfaces/Experimental/menu.crow
@@ -1,3 +1,3 @@
 <Menu>
-	<MenuItem Data="{EditsCommands}"/>
+	<MenuItem Data="{AllCommands}" ItemTemplate="#ui.MenuItem.itemp"/>
 </Menu>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/menuAllCommands.crow b/Samples/common/ui/Interfaces/Experimental/menuAllCommands.crow
new file mode 100644
index 00000000..556ce306
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/menuAllCommands.crow
@@ -0,0 +1,21 @@
+<ListBox Data="{AllCommands}">
+	<Template>
+		<HorizontalStack Name="ItemsContainer" Margin="20" Background="DarkGrey" Fit="true"/>
+	</Template>
+	<ItemTemplate DataType="Crow.Command">
+		<Button Command="{}"/>
+	</ItemTemplate>
+	<ItemTemplate DataType="Crow.CommandGroup">
+		<VerticalStack Fit="true" Background="DarkRed" Margin="10">
+			<Label Text="{Caption}"/>
+			<ListBox Data="{Commands}">
+				<Template>
+					<VerticalStack Name="ItemsContainer" Margin="20" Background="DarkGrey" Fit="true"/>
+				</Template>
+				<ItemTemplate DataType="Crow.Command">
+					<Button Command="{}" />
+				</ItemTemplate>
+			</ListBox>
+		</VerticalStack>
+	</ItemTemplate>
+</ListBox>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/menuAllCommands2.crow b/Samples/common/ui/Interfaces/Experimental/menuAllCommands2.crow
new file mode 100644
index 00000000..fe182326
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/menuAllCommands2.crow
@@ -0,0 +1,21 @@
+<Menu>
+	<MenuItem Caption="test" Fit="true">
+		<MenuItem Caption="test" Fit="true"/>
+		<MenuItem Caption="test" Fit="true"/>
+	</MenuItem>
+	<MenuItem Caption="test" Fit="true"/>
+	<MenuItem Data="{AllCommands}" Fit="true">
+		<ItemTemplate DataType="Command">
+			<MenuItem Command="{}" Fit="true"/>
+		</ItemTemplate>
+		<ItemTemplate DataType="CommandGroup">
+			<Popper Caption="{Caption}" Fit="true">
+				<ListBox Data="{Commands}" Fit="true">
+					<ItemTemplate>				
+						<MenuItem Command="{}" Fit="true"/>
+					</ItemTemplate>
+				</ListBox>
+			</Popper>
+		</ItemTemplate>
+	</MenuItem>
+</Menu>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/menuAllCommands3.crow b/Samples/common/ui/Interfaces/Experimental/menuAllCommands3.crow
new file mode 100644
index 00000000..aee3649b
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/menuAllCommands3.crow
@@ -0,0 +1,40 @@
+<Menu Data="{AllCommands}">
+	<ItemTemplate DataType="Command">
+		<MenuItem Command="{}" Fit="true"/>
+	</ItemTemplate>
+	<ItemTemplate DataType="CommandGroup">
+		<MenuItem Caption="{Caption}" Fit="true">
+			<Template>
+				<ListItem>
+					<Popper Font="{./Font}" Caption="{./Caption}"  Background="{./Background}" PopDirection="{./PopDirection}"
+						Foreground = "{./Foreground}" CanPop="{./HasChildren}"
+						IsPopped="{²./IsOpened}" PopWidth="{./PopWidth}" PopHeight="{./PopHeight}">
+						<Template>
+							<CheckBox IsChecked="{²./IsPopped}" Caption="{./Caption}" Background="{./Background}" Foreground="{./Foreground}">
+								<Template>		
+									<Border Name="border1"
+											MinimumSize = "60,0"
+											Foreground="Transparent"
+											Background="{./Background}">
+											<Label Text="{./Caption}"
+												Foreground="{./Foreground}"
+												Margin="2" HorizontalAlignment="Left"
+												Font="{./Font}"	/>
+									</Border>
+								</Template>		
+							</CheckBox>
+						</Template>
+						<Border Foreground="Red" Width="{../PopWidth}" Height="{../PopHeight}" Background="${MenuBackground}">
+							<VerticalStack Name="ItemsContainer" Width="Stretched" />
+						</Border>
+					</Popper>
+				</ListItem>
+			</Template>
+			<ListBox Data="{Commands}" Fit="true">
+				<ItemTemplate>
+					<MenuItem Command="{}" Fit="true"/>
+				</ItemTemplate>
+			</ListBox>
+		</MenuItem>
+	</ItemTemplate>
+</Menu>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/menus.crow b/Samples/common/ui/Interfaces/Experimental/menus.crow
new file mode 100644
index 00000000..6a6855a9
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/menus.crow
@@ -0,0 +1,13 @@
+<Menu Caption="test">
+	<MenuItem Caption="parent" Width="Fit">
+		<MenuItem Caption="Test" Width="Fit"/>
+		<MenuItem Data="{Commands}" Caption="menu">
+			<Template>
+				<VerticalStack Name="ItemsContainer" Width="Stretched" />
+			</Template>
+			<ItemTemplate>
+				<MenuItem Command="{}"/>
+			</ItemTemplate>
+		</MenuItem>
+	</MenuItem>
+</Menu>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/tabView1.crow b/Samples/common/ui/Interfaces/Experimental/tabView1.crow
new file mode 100644
index 00000000..5df13d0a
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/tabView1.crow
@@ -0,0 +1,4 @@
+<TabView>
+	<GroupBox Caption="test" Background="Black"/>
+	<GroupBox Caption="test" Background="Black"/>
+</TabView>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/tabViewUpdate.crow b/Samples/common/ui/Interfaces/Experimental/tabViewUpdate.crow
new file mode 100644
index 00000000..11ff78ff
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/tabViewUpdate.crow
@@ -0,0 +1,12 @@
+<TabView>
+	<Border Name="container1" Background="Grey">
+	<VerticalStack>
+			<TextBox Text="{²TestString}" MouseEnter="{Background=Salmon}" MouseLeave="{Background=White}"/>
+	</VerticalStack>
+	</Border>
+	<Border  Name="container2" Background="Grey">
+	<VerticalStack>
+			<TextBox Text="{²TestString}" Foreground="Blue" MouseEnter="{Background=Salmon}" MouseLeave="{Background=White}"/>
+	</VerticalStack>
+	</Border>
+</TabView>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/table.crow b/Samples/common/ui/Interfaces/Experimental/table.crow
index b8277a2b..b80ee378 100644
--- a/Samples/common/ui/Interfaces/Experimental/table.crow
+++ b/Samples/common/ui/Interfaces/Experimental/table.crow
@@ -1,14 +1,45 @@
-<Table Columns="test,Fit;test,200" Width="Fit" Background="Blue"> 
-	<TableRow Height="Fit" Background="Red" Margin="5">
-		<Label Text="col1" Background="Grey"/>
-		<Label Text="col2" Background="Grey"/>
+<Table Columns="test,Fit;test,Fit;test,Stretched;test,Fit" Margin="10" 
+	ColumnSpacing="5" Spacing="5" 
+	Foreground="Red"
+	RowsMargin="0"
+	BorderLineWidth="0"
+	VerticalLineWidth="1"
+	HorizontalLineWidth="1"
+	Background="DarkGrey" >   	
+	<TableRow Height="Fit" >
+		<Label Text="firstlkjdqsfmlkjqsl" Background="1,0,0,0.5" HorizontalAlignment="Left" Height="Stretched"/>
+		<Label Text="second" Background="0,1,0,0.5" Height="Stretched"/>
+		<Label Text="third" Background="0,0,1,0.5" Height="Stretched"/>
+		<Label Text="forth" Background="0,1,1,0.5" Height="Stretched"/>
 	</TableRow>
-	<TableRow Height="Fit" Background="Red" Margin="5">
-		<Label Text="this is a test" Background="Grey"/>
-		<Label Text="{/Width}" Background="Grey"/>
+	<TableRow Height="Fit" >
+		<Label Text="first" Background="1,0,0,0.5" HorizontalAlignment="Left"/>
+		<Label Text="seconddsqfsqdfsdqff" Background="0,1,0,0.5"/>
+		<Label Text="thirdkljhkljhkljhkljhkljhkjhkjh" Background="0,0,1,0.5"/>
+		<Label Text="forthbbbbbbbbbb" Background="0,1,1,0.5"/>
 	</TableRow>
-	<TableRow Height="Fit" Background="Red" Margin="5">
-		<Label Text="{/Width}" Background="Grey"/>
-		<Label Text="fkdksls" Background="Grey"/>
+	<TableRow Height="Fit">
+		<Label Text="first" Background="1,0,0,0.5" HorizontalAlignment="Left"/>
+		<Label Text="second" Background="0,1,0,0.5"/>
+		<Label Text="third" Background="0,0,1,0.5"/>
+		<Label Text="forth" Background="0,1,1,0.5"/>
+	</TableRow>
+	<TableRow Height="Fit" >
+		<Label Text="first" Background="1,0,0,0.5" HorizontalAlignment="Left"/>
+		<Label Text="second" Background="0,1,0,0.5"/>
+		<Label Text="third" Background="0,0,1,0.5"/>
+		<Label Text="forth" Background="0,1,1,0.5"/>
+	</TableRow>
+	<TableRow Height="Fit" >
+		<Label Text="first" Background="1,0,0,0.5" HorizontalAlignment="Left"/>
+		<Label Text="second" Background="0,1,0,0.5"/>
+		<Label Text="third" Background="0,0,1,0.5"/>
+		<Label Text="forth" Background="0,1,1,0.5"/>
+	</TableRow>
+	<TableRow Height="Fit" >
+		<Label Text="first" Background="1,0,0,0.5" HorizontalAlignment="Left"/>
+		<Label Text="second" Background="0,1,0,0.5"/>
+		<Label Text="third" Background="0,0,1,0.5"/>
+		<Label Text="forth" Background="0,1,1,0.5"/>
 	</TableRow>
 </Table>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/tabviewOrientation.crow b/Samples/common/ui/Interfaces/Experimental/tabviewOrientation.crow
new file mode 100644
index 00000000..158cb16d
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/tabviewOrientation.crow
@@ -0,0 +1,26 @@
+<TabView Orientation="Horizontal">
+	<Template>
+		<GenericStack Orientation="{./OppositeOrientation}" Spacing="0" Background="{./Background}"> 
+			<ListBox  Data="{./Items}" Fit="true" HorizontalAlignment="Left" VerticalAlignment="Top" SelectedItem="{²./SelectedItem}"> 
+				<Template>
+					<GenericStack Orientation="{../../../Orientation}" Name="ItemsContainer" />
+				</Template>
+				<ItemTemplate>
+					<ListItem Fit="true" Background="${InactiveTabItem}" IsSelected="{IsVisible}" Margin="5"
+							Selected="{.DataSource.Visible='true'};{Background=.DataSource.Background}"
+							Unselected="{.DataSource.Visible='false'};{Background=${InactiveTabItem}}"> 
+						<Label Text="{Name}" />
+					</ListItem>
+				</ItemTemplate>
+			</ListBox>
+			<Group Name="ItemsContainer" />
+		</GenericStack>
+	</Template>
+	<GroupBox Name="item 1" Caption="item 1" IsVisible="true" Background="Violet"/>			
+	<GroupBox Name="item 2" Caption="item 2" IsVisible="false" Background="CornflowerBlue"/>
+	<GroupBox Name="item 3" Caption="item 3" IsVisible="false" Background="Red"/>
+	<GroupBox Name="item 4" Caption="item 4" IsVisible="false" Background="Green"/>
+	<GroupBox Name="item 5" Caption="item 5" IsVisible="false" Background="Brown"/>
+	<GroupBox Name="item 6" Caption="item 6" IsVisible="false" Background="RoyalBlue"/>
+	<GroupBox Name="item 7" Caption="item 7" IsVisible="false" Background="Yellow"/>
+</TabView>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/tabviewOrientationDynamic.crow b/Samples/common/ui/Interfaces/Experimental/tabviewOrientationDynamic.crow
new file mode 100644
index 00000000..cfddcb91
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/tabviewOrientationDynamic.crow
@@ -0,0 +1,30 @@
+<VerticalStack>
+<!--	<EnumSelector EnumValue="{²../tv.Orientation}" />-->
+	<TabView Name="tv" Orientation="Horizontal" >
+		<Template>
+			<GenericStack Orientation="{./OppositeOrientation}" Spacing="0" Background="{./Background}" > 
+				<ListBox  Data="{./Items}" Width="{./TabHeight}" Height="{./TabWidth}" HorizontalAlignment="Left" VerticalAlignment="Top"
+							SelectedItem="{²./SelectedItem}"> 
+					<Template>
+						<GenericStack Orientation="{../../../Orientation}" Name="ItemsContainer"  />
+					</Template>
+					<ItemTemplate>
+						<ListItem Fit="true" Background="${InactiveTabItem}" IsSelected="{IsVisible}" Margin="5"
+								Selected="{.DataSource.Visible='true'};{Background=.DataSource.Background}"
+								Unselected="{.DataSource.Visible='false'};{Background=${InactiveTabItem}}"> 
+							<Label Text="{Name}" />
+						</ListItem>
+					</ItemTemplate>
+				</ListBox>
+				<Group Name="ItemsContainer" />
+			</GenericStack>
+		</Template>
+		<GroupBox Name="item 1" Caption="item 1" IsVisible="true" Background="Violet"/>			
+		<GroupBox Name="item 2" Caption="item 2" IsVisible="false" Background="CornflowerBlue"/>
+		<GroupBox Name="item 3" Caption="item 3" IsVisible="false" Background="Red"/>
+		<GroupBox Name="item 4" Caption="item 4" IsVisible="false" Background="Green"/>
+		<GroupBox Name="item 5" Caption="item 5" IsVisible="false" Background="Brown"/>
+		<GroupBox Name="item 6" Caption="item 6" IsVisible="false" Background="RoyalBlue"/>
+		<GroupBox Name="item 7" Caption="item 7" IsVisible="false" Background="Yellow"/>
+	</TabView>
+</VerticalStack>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/tabviewTest.crow b/Samples/common/ui/Interfaces/Experimental/tabviewTest.crow
index b876ab7f..a73f9471 100644
--- a/Samples/common/ui/Interfaces/Experimental/tabviewTest.crow
+++ b/Samples/common/ui/Interfaces/Experimental/tabviewTest.crow
@@ -1,28 +1,27 @@
-<VerticalStack>
-	<ListBox Name="lb">
-		<Template>
-			<VerticalStack Spacing="0"> 
-				<ListBox Data="{./Items}" Height="Fit" SelectedItem="{²./SelectedItem}">
-					<Template>
-						<HorizontalStack Name="ItemsContainer" Background="{./Background}"/>
-					</Template>
-					<ItemTemplate>
-						<ListItem Width="Fit" Background="Transparent" IsSelected="{²IsVisible}"
-								Tooltip="{GetType}"
-								Selected="{DataSource.Visible='true'};{Background=CornflowerBlue}"
-								Unselected="{.DataSource.Visible='false'};{Background=Transparent}"> 
-							<Label Text="{Caption}" Margin="5" />
-						</ListItem>
-					</ItemTemplate>
-				</ListBox>			
-				<Group Name="ItemsContainer"/>
-			</VerticalStack>
-		</Template>
-		<GroupBox Caption="item 1" IsVisible="true" Background="CornflowerBlue">
-			<Label Text="{Caption}"/>
-		</GroupBox>
-		<GroupBox Caption="item 2" IsVisible="false" Background="CornflowerBlue"/>
-		<GroupBox Caption="item 3" IsVisible="false" Background="CornflowerBlue"/>
-	</ListBox>
-	<Label DataSource="{../lb.SelectedItem}" Text="{Caption}"/> 
-</VerticalStack>
\ No newline at end of file
+<TabView Orientation="Vertical">
+	<Template>
+		<GenericStack Orientation="{./OppositeOrientation}" Spacing="0" Background="{./Background}" > 
+			<ListBox  Data="{./Items}" Width="Fit" Height="Fit" HorizontalAlignment="Left" VerticalAlignment="Top"
+						SelectedItem="{²./SelectedItem}"> 
+				<Template>
+					<GenericStack Orientation="{../../../Orientation}" Name="ItemsContainer" Width="Fit" />
+				</Template>
+				<ItemTemplate>
+					<ListItem Width="Stretched" Height="Fit" Background="${InactiveTabItem}" IsSelected="{IsVisible}" Margin="5"
+							Selected="{.DataSource.Visible='true'};{Background=.DataSource.Background}"
+							Unselected="{.DataSource.Visible='false'};{Background=${InactiveTabItem}}"> 
+						<Label Text="{Name}" Width="Fit" />
+					</ListItem>
+				</ItemTemplate>
+			</ListBox>
+			<Group Name="ItemsContainer" />
+		</GenericStack>
+	</Template>
+	<GroupBox Name="item 1qdsf" Caption="item 1" IsVisible="true" Background="Violet"/>			
+	<GroupBox Name="item 2qdsmlkjqsdlfkj" Caption="item 2" IsVisible="false" Background="CornflowerBlue"/>
+	<GroupBox Name="item 3" Caption="item 3" IsVisible="false" Background="Red"/>
+	<GroupBox Name="item 4qsdfmlkjqs" Caption="item 4" IsVisible="false" Background="Green"/>
+	<GroupBox Name="item 5" Caption="item 5" IsVisible="false" Background="Brown"/>
+	<GroupBox Name="item 6" Caption="item 6" IsVisible="false" Background="RoyalBlue"/>
+	<GroupBox Name="item 7qsdf" Caption="item 7" IsVisible="false" Background="Yellow"/>
+</TabView>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Experimental/tabviewTestVertical2.crow b/Samples/common/ui/Interfaces/Experimental/tabviewTestVertical2.crow
index 6ecc74ed..d1f24c4f 100644
--- a/Samples/common/ui/Interfaces/Experimental/tabviewTestVertical2.crow
+++ b/Samples/common/ui/Interfaces/Experimental/tabviewTestVertical2.crow
@@ -1,4 +1,5 @@
-<HorizontalStack Spacing="0" > 
+<?xml version="1.0"?>
+<HorizontalStack Spacing="0" > 
 	<ListBox Data="{../grp.Children}" Width="Fit"> 
 		<Template>
 			<VerticalStack Name="ItemsContainer" Background="{./Background}"/> 
diff --git a/Samples/common/ui/Interfaces/Experimental/treeViewMenu.crow b/Samples/common/ui/Interfaces/Experimental/treeViewMenu.crow
new file mode 100644
index 00000000..bd45b85f
--- /dev/null
+++ b/Samples/common/ui/Interfaces/Experimental/treeViewMenu.crow
@@ -0,0 +1,45 @@
+<TreeView Data="{AllCommands}" Fit="true">
+	<Template>
+		<VerticalStack Name="ItemsContainer"/>
+	</Template>
+	<ItemTemplate DataType="Crow.Command">
+		<ListItem CornerRadius="2" Margin="0" Fit="true"
+				Selected="{Background=${ControlHighlight}}"
+				Unselected="{Background=Transparent}">
+			<Button Command="{}" />
+		</ListItem>
+	</ItemTemplate>
+	<ItemTemplate DataType="Crow.CommandGroup" Data="Commands">
+		<ListItem
+				Selected="{/exp.Background=${ControlHighlight}}"
+				Unselected="{/exp.Background=Transparent}">
+			<Expandable Name="exp" Caption="{Name}" MouseDoubleClick="/onClickForExpand">
+				<Template>
+					<VerticalStack>
+						<Border CornerRadius="2" Margin="0" Height="Fit" MouseDoubleClick="./onClickForExpand"
+								Foreground="Transparent"
+								MouseEnter="{Foreground=DimGrey}"
+								MouseLeave="{Foreground=Transparent}">
+							<HorizontalStack Background="{./Background}" Spacing="1">
+								<Image Margin="1" Width="9" Height="9" Focusable="true" MouseDown="./onClickForExpand"
+									Path="{./Image}"
+									Visible="{./IsExpandable}"
+									SvgSub="{./IsExpanded}"
+									MouseEnter="{Background=LightGrey}"
+									MouseLeave="{Background=Transparent}"/>
+								<Image Margin="1" Width="16" Height="16"
+									Path="#Crow.Icons.folder.svg" SvgSub="{./IsExpanded}"/>
+								<Label Text="{./Caption}"/>
+							</HorizontalStack>
+						</Border>
+						<Container Name="Content" Visible="false"/>
+					</VerticalStack>
+				</Template>
+				<HorizontalStack Height="Fit">
+					<Widget Width="12" Height="10"/>
+					<VerticalStack Height="Fit" Name="ItemsContainer"/>
+				</HorizontalStack>
+			</Expandable>
+		</ListItem>
+	</ItemTemplate>
+</TreeView>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/GraphicObject/blueLine.crow b/Samples/common/ui/Interfaces/GraphicObject/blueLine.crow
new file mode 100644
index 00000000..32d5c166
--- /dev/null
+++ b/Samples/common/ui/Interfaces/GraphicObject/blueLine.crow
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<Widget Margin="10" Width="0" Height="20"
+		Background = "vgradient|0:0.1,0.1,0.1,0.1|0.5:Blue|1:0.1,0.1,0.1,0.1"/>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Stack/StretchedInFit.crow b/Samples/common/ui/Interfaces/Stack/StretchedInFit.crow
index fdd5edcf..dc230cb6 100644
--- a/Samples/common/ui/Interfaces/Stack/StretchedInFit.crow
+++ b/Samples/common/ui/Interfaces/Stack/StretchedInFit.crow
@@ -4,4 +4,17 @@
 	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
 	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
 	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
+	<Label Text="this is a test" Margin="0" Width="Stretched" Height="Fit" Background="SeaGreen"/>
 </VerticalStack>
\ No newline at end of file
diff --git a/Samples/common/ui/Interfaces/Stack/StretchedInFit2.crow b/Samples/common/ui/Interfaces/Stack/StretchedInFit2.crow
index 57a57609..612caeb5 100644
--- a/Samples/common/ui/Interfaces/Stack/StretchedInFit2.crow
+++ b/Samples/common/ui/Interfaces/Stack/StretchedInFit2.crow
@@ -4,10 +4,10 @@
 		<VerticalStack Width="Stretched" Margin="10" Background="FireBrick">
 			<VerticalStack Width="Stretched" Margin="10" Background="Teal">
 				<VerticalStack Width="Stretched" Margin="10" Background="CornflowerBlue">
-					<Label Text="{./Caption}" Width="Stretched"/>
-					<Label Text="{./Caption}" Width="Stretched"/>
-					<Label Text="{./Caption}" Width="Stretched"/>
-					<Label Text="{./Caption}" Width="Stretched"/>
+					<Label Text="test" Width="Stretched" Foreground="Black"/>
+					<Label Text="Caption" Width="Stretched"/>
+					<Label Text="Caption" Width="Stretched"/>
+					<Label Text="Caption" Width="Stretched"/>
 				</VerticalStack>
 			</VerticalStack>
 		</VerticalStack>
diff --git a/Samples/common/ui/templates/MenuItem.itemp b/Samples/common/ui/templates/MenuItem.itemp
new file mode 100644
index 00000000..5cd22d2e
--- /dev/null
+++ b/Samples/common/ui/templates/MenuItem.itemp
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ItemTemplate DataType="Command">
+	<Button Command="{}" Fit="true"/>
+</ItemTemplate>
+<ItemTemplate DataType="CommandGroup">
+	<MenuItem Data="{}" Fit="true" />
+</ItemTemplate>
+