- 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

5 files changed, 18 insertions, 7 deletions

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 13576b24..5fcbbc38 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -34,6 +34,8 @@ namespace test
 		int frameCpt = 0;

 		int idx = 0;

 		string[] testFiles = {

+			"test_Listbox.goml",

+			"testCombobox.goml",

 			"fps.goml",

 			"testCheckbox.goml",

 			"testExpandable.goml",

@@ -48,7 +50,6 @@ namespace test
 			"testMsgBox.goml",

 			"testGrid.goml",

 			"testMeter.goml",

-//			"testCombobox.goml",

 //			"test4.goml",

 		};

 

@@ -101,7 +102,8 @@ namespace test
 			base.OnLoad (e);

 			//this.AddWidget(new test4());

 

-			LoadInterface("Interfaces/" + testFiles[idx]);

+			GraphicObject obj = LoadInterface("Interfaces/" + testFiles[idx]);

+			obj.DataSource = this;

 		}

 		protected override void OnUpdateFrame (FrameEventArgs e)

 		{

@@ -128,7 +130,8 @@ namespace test
 			if (idx == testFiles.Length)

 				idx = 0;

 			this.Title = testFiles [idx];

-			LoadInterface("Interfaces/" + testFiles[idx]);

+			GraphicObject obj = LoadInterface("Interfaces/" + testFiles[idx]);

+			obj.DataSource = this;

 

 		}

 

diff --git a/Tests/Interfaces/testCheckbox.goml b/Tests/Interfaces/testCheckbox.goml
index 999d79f9..966455e6 100755
--- a/Tests/Interfaces/testCheckbox.goml
+++ b/Tests/Interfaces/testCheckbox.goml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>

-<Checkbox Width="100" Height="-1" Caption="Checkbox" Background="DimGray" IsChecked="true"/>

+<Checkbox Width="-1" Height="-1" Caption="Checkbox" Background="DimGray" IsChecked="false"/>

 

diff --git a/Tests/Interfaces/testExpandable.goml b/Tests/Interfaces/testExpandable.goml
index 5cae7ae6..35cf3d64 100755
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@ -5,5 +5,9 @@
 			<Checkbox Name="chk2" IsChecked="true"/>

 			<Checkbox Name="chk3"/>

 			<Checkbox Name="chk4"/>

+			<HorizontalStack Fit="true" Margin="20">

+				<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>

+				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>

+			</HorizontalStack>

 		</VerticalStack>

 </Expandable>

diff --git a/Tests/Interfaces/testPopper.goml b/Tests/Interfaces/testPopper.goml
index 4c6ba76b..3686599a 100755
--- a/Tests/Interfaces/testPopper.goml
+++ b/Tests/Interfaces/testPopper.goml
@@ -7,6 +7,10 @@
 			<Checkbox Name="chk2" IsChecked="true"/>

 			<Checkbox Name="chk3"/>

 			<Checkbox Name="chk4"/>

+			<HorizontalStack Fit="true" Margin="20">

+				<Label Name="captionFps" Text="Fps:" Width="50" TextAlignment="RightCenter"/>

+				<Label Name="valueFps" Text="{fps}" Font="droid , 12" Width="50" TextAlignment="Center" Background="AoEnglish"/>

+			</HorizontalStack>

 		</VerticalStack>	

 	</Border>

 </Popper>

diff --git a/Tests/Interfaces/test_Listbox.goml b/Tests/Interfaces/test_Listbox.goml
index b132a87e..9f7645ab 100755
--- a/Tests/Interfaces/test_Listbox.goml
+++ b/Tests/Interfaces/test_Listbox.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>

 <!--<ListBox Data="{TestList}" Focusable="true"/>-->

 <ListBox Data="{TestList}" Background="0,5;0,5;0,5;0,5"

-			 HorizontalAlignment="Left" Width="0" Height="0" Margin="50">

+			 HorizontalAlignment="Left" Width="-1" Height="-1" Margin="50">

 <!--	<Template>

 		<Border BorderWidth="1" Margin="1" MinimumSize="100;100" Width="0" Height="0" >

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

@@ -10,13 +10,13 @@
 			</Scroller>

 		</Border>

 	</Template>-->

-	<Template>

+<!--	<Template>

 		<Border BorderWidth="1" Margin="1" MinimumSize="100;100" 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"/>

 			</Scroller>

 		</Border>

-	</Template>

+	</Template>-->

 </ListBox>