- GraphicTree parsing bindings in templates instead of using

datasource which could be kept for other uses
- ListBox bindings debug
- LogicalParent for Popper to get correct DataSource for content

12 files changed, 68 insertions, 64 deletions

diff --git a/Templates/Checkbox.goml b/Templates/Checkbox.goml
index 44e66817..80ec112d 100755
--- a/Templates/Checkbox.goml
+++ b/Templates/Checkbox.goml
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>

-<HorizontalStack Spacing="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-	<Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub}"/>

-	<Label Text="{Caption}" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>

+<!--<HorizontalStack Spacing="1" Height="100" Width="300">

+	<Image Margin="2" Width="14" Height="14" Path="{../../Image}"  SvgSub="{../../SvgSub}"/>

+	<Label Text="{../../Caption}" Height="80" Width="200"/>

+</HorizontalStack>-->

+<HorizontalStack Spacing="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">

+	<Image Margin="2" Width="14" Height="14" Path="{../../Image}" SvgSub="{../../SvgSub}"/>

+	<Label Text="{../../Caption}" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}"/>

 </HorizontalStack>
\ No newline at end of file
diff --git a/Templates/Combobox.goml b/Templates/Combobox.goml
index 21824049..9abd6361 100755
--- a/Templates/Combobox.goml
+++ b/Templates/Combobox.goml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>

-<Border CornerRadius="0" BorderColor="LightGray" Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-	<HorizontalStack Margin="1" Spacing="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-		<Label Margin="1" Foreground="Black" Background="White" Text="{Text}" 

-			Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>

+<Border CornerRadius="0" BorderColor="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">

+	<HorizontalStack Margin="1" Spacing="1" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">

+		<Label Margin="1" Foreground="Black" Background="White" Text="{../../../Text}" 

+			Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}"/>

 		<Button Width="14" Height="14" >

 			<Image Margin="0"  Path="#go.Images.Icons.updown.svg" SvgSub="down"/>

 		</Button>

diff --git a/Templates/ComboboxOverlay.goml b/Templates/ComboboxOverlay.goml
index 349be301..4665846f 100755
--- a/Templates/ComboboxOverlay.goml
+++ b/Templates/ComboboxOverlay.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>

-<Border BorderWidth="1" Margin="1" MinimumSize="20;20" Height="{TemplatedHeight}" Width="{TemplatedWidth}" >

+<Border BorderWidth="1" Margin="1" MinimumSize="20;20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" >

 	<Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"

-		Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-		<VerticalStack Height="-1" Width="{TemplatedWidth}" Name="List" Margin="0" VerticalAlignment="Top"/>

+		Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">

+		<VerticalStack Height="-1" Width="{../../../TemplatedWidth}" Name="List" Margin="0" VerticalAlignment="Top"/>

 	</Scroller>

 </Border>
\ No newline at end of file
diff --git a/Templates/Expandable.goml b/Templates/Expandable.goml
index 1f3c5281..4e9a8540 100755
--- a/Templates/Expandable.goml
+++ b/Templates/Expandable.goml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>

-<Border BorderWidth="1" BorderColor="LightGray" Height="{TemplatedHeight}" Width="{TemplatedWidth}" 

-		MouseClick="onMouseClick">

-	<VerticalStack Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-		<HorizontalStack Spacing="1" Height="-1" Width="{TemplatedWidth}">

-			<Image Margin="2" Width="12" Height="12" Path="{Image}" SvgSub="{SvgSub}"/>

-			<Label Text="{Title}" Width="{TemplatedWidth}"/>

+<Border BorderWidth="1" BorderColor="LightGray" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" 

+		MouseClick="../onMouseClick">

+	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">

+		<HorizontalStack Spacing="1" Height="-1" Width="{../../../TemplatedWidth}">

+			<Image Margin="2" Width="12" Height="12" Path="{../../../../Image}" SvgSub="{../../../../SvgSub}"/>

+			<Label Text="{../../../../Title}" Width="{../../../../TemplatedWidth}"/>

 		</HorizontalStack>

-		<Container Name="Content" Visible="false" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>

+		<Container Name="Content" Visible="false" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}"/>

 	</VerticalStack>

 </Border>
\ No newline at end of file
diff --git a/Templates/Groupbox.goml b/Templates/Groupbox.goml
index d804aab8..789cd60f 100755
--- a/Templates/Groupbox.goml
+++ b/Templates/Groupbox.goml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<Group Height="{TemplatedHeight}" Width="{TemplatedWidth}">
+<Group Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">
 	<Border CornerRadius="5" BorderWidth="1" Margin="6"
-		Height="{TemplatedHeight}" Width="{TemplatedWidth}">
+		Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
 		<Container Name="Content" Margin="10"
-				Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>
+				Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}"/>
 	</Border>
-	<Label Text="{Title}" VerticalAlignment="Top" Left="15"
+	<Label Text="{../../Title}" VerticalAlignment="Top" Left="15"
 		Background="Clear" Margin="1"/>
 </Group>
\ No newline at end of file
diff --git a/Templates/Listbox.goml b/Templates/Listbox.goml
index 50922585..28241e27 100755
--- a/Templates/Listbox.goml
+++ b/Templates/Listbox.goml
@@ -2,9 +2,9 @@
 <!--<Border BorderWidth="1" Margin="1" MinimumSize="0;100" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Background="Gray">

 	<VerticalStack Name="List" Margin="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>

 </Border>-->

-<Border BorderWidth="1" Margin="1" MinimumSize="20;20" Height="{TemplatedHeight}" Width="{TemplatedWidth}" >

+<Border BorderWidth="1" Margin="1" MinimumSize="20;20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" >

 	<Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"

-		Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-		<VerticalStack Height="-1" Width="{TemplatedWidth}" Name="List" Margin="0" VerticalAlignment="Top"/>

+		Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">

+		<VerticalStack Height="-1" Width="{../../../TemplatedWidth}" Name="List" Margin="0" VerticalAlignment="Top"/>

 	</Scroller>

 </Border>
\ No newline at end of file
diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml
index 6488deb9..e2eccd71 100644
--- a/Templates/MessageBox.goml
+++ b/Templates/MessageBox.goml
@@ -1,27 +1,27 @@
 <?xml version="1.0"?>
-<Border Height="{TemplatedHeight}" Width="{TemplatedWidth}" BorderWidth="1" BorderColor="White" CornerRadius="10" >
-	<VerticalStack Height="{TemplatedHeight}" Width="{TemplatedWidth}" Background="0,4;0,4;0,4;0,4">
-		<Border BorderWidth="1" BorderColor="White" Width="{TemplatedWidth}" Height="-1" 
+<Border Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" BorderWidth="1" BorderColor="White" CornerRadius="10" >
+	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}" Background="0,4;0,4;0,4;0,4">
+		<Border BorderWidth="1" BorderColor="White" Width="{../../../TemplatedWidth}" Height="-1" 
 				Background="0,1;0,5;1,0;0,5">
-			<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{TemplatedWidth}" Height="-1" >
+			<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../TemplatedWidth}" Height="-1" >
 				<GraphicObject Width="5" Height="5"/>
-				<Image Margin="1" Width="12" Height="12" Path="{Icon}"/>
-				<Label Foreground="White" Width="{TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{Title}" />
+				<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>
+				<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />
 				<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"
 					MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
 					<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#go.Images.Icons.exit2.svg"
-						 MouseClick="butQuitPress"/>
+						 MouseClick="../../../../../../butQuitPress"/>
 				</Border>
 				<GraphicObject Width="5" Height="5"/>
 			</HorizontalStack>
 		</Border>
-		<HorizontalStack Spacing="10" Margin="10" Height="{TemplatedHeight}" Width="{TemplatedWidth}">
+		<HorizontalStack Spacing="10" Margin="10" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}">
 			<Image Name="Image" Width="32" Height="32"
 				Path="#go.Images.Icons.iconInfo.svg" />
-			<TextRun Font="serif, 12" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Text="{Message}"
+			<TextRun Font="serif, 12" Height="{../../../../TemplatedHeight}" Width="{../../../../TemplatedWidth}" Text="{../../../../Message}"
 				Multiline="true" WordWrap="true"/>		
 		</HorizontalStack>
-		<HorizontalStack Height="-1" Width="{TemplatedWidth}" Margin="5">
+		<HorizontalStack Height="-1" Width="{../../../TemplatedWidth}" Margin="5">
 			<GraphicObject Height="5"/>
 			<Button Text="Ok"/>
 			<Button Text="Cancel"/>
diff --git a/Templates/Popper.goml b/Templates/Popper.goml
index 534c677f..472fe183 100755
--- a/Templates/Popper.goml
+++ b/Templates/Popper.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>

-<Border BorderWidth="1" BorderColor="LightGray" Height="-1" Width="{TemplatedWidth}" MouseClick="onMouseClick">

-	<HorizontalStack Spacing="1" Height="-1"  Width="{TemplatedWidth}">

-		<Image Margin="2" Width="12" Height="12" Path="{Image}" SvgSub="{SvgSub}"/>

-		<Label Text="{Title}"  Width="{TemplatedWidth}"/>

+<Border BorderWidth="1" BorderColor="LightGray" Height="-1" Width="{../TemplatedWidth}" MouseClick="../onMouseClick">

+	<HorizontalStack Spacing="1" Height="-1"  Width="{../../TemplatedWidth}">

+		<Image Margin="2" Width="12" Height="12" Path="{../../../Image}" SvgSub="{../../../SvgSub}"/>

+		<Label Text="{../../../Title}"  Width="{../../../TemplatedWidth}"/>

 	</HorizontalStack>

 </Border>
\ No newline at end of file
diff --git a/Templates/RadioButton.goml b/Templates/RadioButton.goml
index 44e66817..94b78e24 100755
--- a/Templates/RadioButton.goml
+++ b/Templates/RadioButton.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>

-<HorizontalStack Spacing="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-	<Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub}"/>

-	<Label Text="{Caption}" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>

+<HorizontalStack Spacing="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">

+	<Image Margin="2" Width="14" Height="14" Path="{../../Image}" SvgSub="{../../SvgSub}"/>

+	<Label Text="{../../Caption}" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}"/>

 </HorizontalStack>
\ No newline at end of file
diff --git a/Templates/Scrollbar.goml b/Templates/Scrollbar.goml
index 0fe9da3d..8dcadc64 100755
--- a/Templates/Scrollbar.goml
+++ b/Templates/Scrollbar.goml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>

 <Border BorderWidth="1" BorderColor="LightGray">

-	<GenericStack Orientation="{Orientation}" Width="0" Height="0">

-		<Button Width="12" Height="12" MouseClick="onScrollBack">

-			<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="up"/>

+	<GenericStack Orientation="{../../Orientation}" Width="0" Height="0">

+		<Button Width="12" Height="12" MouseClick="../../../onScrollBack">

+			<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="../../../../up"/>

 		</Button>

-		<Slider Name="Slider" Value="{Scroll}" Maximum="{MaximumScroll}" 

-			Width="{Width}" Height="{Height}" Orientation="{Orientation}"

-			ValueChanged="onSliderValueChange"/>

-		<Button Width="12" Height="12" MouseClick="onScrollForth">

-			<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="down"/>

+		<Slider Name="Slider" Value="{../../../Scroll}" Maximum="{../../../MaximumScroll}" 

+			Width="{../../../Width}" Height="{../../../Height}" Orientation="{../../../Orientation}"

+			ValueChanged="../../../onSliderValueChange"/>

+		<Button Width="12" Height="12" MouseClick="../../../onScrollForth">

+			<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="../../../../down"/>

 		</Button>

 	</GenericStack>

 </Border>
\ No newline at end of file
diff --git a/Templates/Spinner.goml b/Templates/Spinner.goml
index f9bc82b1..ddfa4991 100755
--- a/Templates/Spinner.goml
+++ b/Templates/Spinner.goml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Background="White">
-	<HorizontalStack Name="hstack" Margin="0" Spacing="2" Height="{TemplatedHeight}" Width="{TemplatedWidth}">
-		<Label Foreground="DimGray" Height="{TemplatedHeight}" Width="{TemplatedWidth}" 
-			Text="{Value}" Margin="1" TextAlignment="RightCenter"/>
-		<VerticalStack Width="-1" Height="{TemplatedHeight}" Spacing="1" >
-			<Button Width="12" Height="8" MouseClick="onUp">
+<Border BorderWidth="1" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}" Background="White">
+	<HorizontalStack Name="hstack" Margin="0" Spacing="2" Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">
+		<Label Foreground="DimGray" Height="{../../../TemplatedHeight}" Width="{../../../TemplatedWidth}" 
+			Text="{../../../Value}" Margin="1" TextAlignment="RightCenter"/>
+		<VerticalStack Width="-1" Height="{../../../TemplatedHeight}" Spacing="1" >
+			<Button Width="12" Height="8" MouseClick="../../../../onUp">
 				<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="up"/>
 			</Button>
-			<Button Width="12" Height="8" MouseClick="onDown">
+			<Button Width="12" Height="8" MouseClick="../../../../onDown">
 				<Image Margin="1" Path="#go.Images.Icons.updown.svg" SvgSub="down"/>
 			</Button>
 		</VerticalStack>
diff --git a/Templates/Window.goml b/Templates/Window.goml
index d6f08cde..97bad4ce 100755
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -1,20 +1,20 @@
 <?xml version="1.0"?>

-<Border BorderWidth="1" BorderColor="White" CornerRadius="20" Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-	<VerticalStack Height="{TemplatedHeight}" Width="{TemplatedWidth}">

-		<Border BorderWidth="1" BorderColor="White" Width="{TemplatedWidth}" Height="-1" 

+<Border BorderWidth="1" BorderColor="White" CornerRadius="20" Height="{../TemplatedHeight}" Width="{../TemplatedWidth}">

+	<VerticalStack Height="{../../TemplatedHeight}" Width="{../../TemplatedWidth}">

+		<Border BorderWidth="1" BorderColor="White" Width="{../../../TemplatedWidth}" Height="-1" 

 				Background="0,1;0,5;1,0;0,5">

-			<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{TemplatedWidth}" Height="-1" >

+			<HorizontalStack Name="hs" Margin="1" Spacing="1" Width="{../../../../TemplatedWidth}" Height="-1" >

 				<GraphicObject Width="5"/>

-				<Image Margin="1" Width="12" Height="12" Path="{Icon}"/>

-				<Label Foreground="White" Width="{TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{Title}" />

+				<Image Margin="1" Width="12" Height="12" Path="{../../../../../Icon}"/>

+				<Label Foreground="White" Width="{../../../../../TemplatedWidth}" Margin="1" TextAlignment="Center" Text="{../../../../../Title}" />

 				<Border CornerRadius="6" BorderWidth="1" BorderColor="Transparent"  Height="12" Width="12"

 					MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">

 					<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#go.Images.Icons.exit2.svg"

-						 MouseClick="butQuitPress"/>

+						 MouseClick="../../../../../../butQuitPress"/>

 				</Border>

 				<GraphicObject Width="5"/>

 			</HorizontalStack>

 		</Border>

-		<Container Name="Content" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Background="0,5;0,5;0,5;0,5"/>

+		<Container Name="Content" Height="{../../../../TemplatedHeight}" Width="{../../../../TemplatedWidth}" Background="0,5;0,5;0,5;0,5"/>

 	</VerticalStack>

 </Border>
\ No newline at end of file