From 1c4994e194111cf744c26b9c1b63605782a22e71 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Mon, 14 Sep 2015 16:48:48 +0200
Subject: [PATCH] update and test Popper and Expandable templates with dynamic
 binding instead of onLoadTemplate hook

---
 Templates/Expandable.goml            |  8 ++---
 Templates/Popper.goml                |  6 ++--
 Tests/GOLIBTests.cs                  |  3 +-
 Tests/Interfaces/testExpandable.goml | 20 +++++------
 Tests/Interfaces/testPopper.goml     |  6 ++++
 Tests/Tests.csproj                   |  3 ++
 src/GraphicObjects/Expandable.cs     | 44 ++++++++++++++---------
 src/GraphicObjects/Popper.cs         | 54 +++++++++++++++-------------
 8 files changed, 83 insertions(+), 61 deletions(-)
 create mode 100755 Tests/Interfaces/testPopper.goml

diff --git a/Templates/Expandable.goml b/Templates/Expandable.goml
index f2c2d098..877fcdff 100755
--- a/Templates/Expandable.goml
+++ b/Templates/Expandable.goml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <Border BorderWidth="1" BorderColor="LightGray"  Height="-1" Width="0" MouseClick="onMouseClick">
-	<VerticalStack MouseClick="onMouseClick" Height="-1" Width="0" Name="vsTemplateExpander">
-		<HorizontalStack Name="hsTemplateExpander" Spacing="1" Focusable="false" Height="-1" Width="0">
-			<Image Name="Image" Margin="3" Width="16" Height="16" Path="#go.Images.Icons.expandable.svg"/>
-			<Label Name="Caption"/>
+	<VerticalStack Height="-1" Width="0" Name="vsTemplateExpander">
+		<HorizontalStack Spacing="1" Focusable="false" Height="-1" Width="0">
+			<Image Margin="2" Width="12" Height="12" Path="{Image}" SvgSub="{SvgSub}"/>
+			<Label Text="{Title}" Width="0"/>
 		</HorizontalStack>
 		<Container Name="Content" Visible="false"/>
 	</VerticalStack>
diff --git a/Templates/Popper.goml b/Templates/Popper.goml
index 638c73c3..27dd8c8d 100755
--- a/Templates/Popper.goml
+++ b/Templates/Popper.goml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <Border BorderWidth="1" BorderColor="LightGray" Height="-1" MouseClick="onMouseClick">
-	<HorizontalStack Name="hsTemplateExpander" Spacing="1" Focusable="false" Height="-1" Width="0">
-		<Image Name="Image" Margin="3" Width="16" Height="16" Path="#go.Images.Icons.expandable.svg"/>
-		<Label Name="Caption"/>
+	<HorizontalStack Spacing="1" Focusable="false" Height="-1" Width="0">
+		<Image Margin="2" Width="12" Height="12" Path="{Image}" SvgSub="{SvgSub}"/>
+		<Label Text="{Title}" Width="0"/>
 	</HorizontalStack>
 </Border>
\ No newline at end of file
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index d11ab959..6dd1909b 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -31,6 +31,8 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"testPopper.goml",
+			"testExpandable.goml",
 			"test6.goml",
 			"testHStack.goml",
 			"testMsgBox.goml",
@@ -45,7 +47,6 @@ namespace test
 			"test_stack.goml",
 			"testScrollbar.goml",
 			"testSpinner.goml",
-			"testExpandable.goml",
 			"testWindow.goml",
 			"fps.goml",
 			"testMeter.goml",
diff --git a/Tests/Interfaces/testExpandable.goml b/Tests/Interfaces/testExpandable.goml
index 0caf0a32..712a485f 100755
--- a/Tests/Interfaces/testExpandable.goml
+++ b/Tests/Interfaces/testExpandable.goml
@@ -1,13 +1,9 @@
 <?xml version="1.0"?>
-<Container Name="TopContainer" Width="400" Height="400"
-	Margin="20" Focusable="True" Background="Gray">
-
-	<Expandable Width="150" Height="-1" Margin="2" VerticalAlignment="Top">
-			<VerticalStack Width="100" Height="-1">
-				<Checkbox Name="chk1"/>
-				<Checkbox Name="chk2" IsChecked="true"/>
-				<Checkbox Name="chk3"/>
-				<Checkbox Name="chk4"/>
-			</VerticalStack>		
-	</Expandable>
-</Container>
\ No newline at end of file
+<Expandable Title="Test expandable" Width="150" Background="DimGray">
+		<VerticalStack Width="100" Height="-1">
+			<Checkbox Name="chk1"/>
+			<Checkbox Name="chk2" IsChecked="true"/>
+			<Checkbox Name="chk3"/>
+			<Checkbox Name="chk4"/>
+		</VerticalStack>		
+</Expandable>
diff --git a/Tests/Interfaces/testPopper.goml b/Tests/Interfaces/testPopper.goml
new file mode 100755
index 00000000..8f66d751
--- /dev/null
+++ b/Tests/Interfaces/testPopper.goml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<Popper Title="TestPopper" Width="100" Background="DimGray">
+	<Border Fit="True" Background="ArmyGreen">
+		<Image Fit="true" Path="#go.Images.Icons.tetra.png" Margin="10"/>
+	</Border>
+</Popper>
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index c72a8135..b8a6acc7 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -146,6 +146,9 @@
     <None Include="Interfaces\test6.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\testPopper.goml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Expandable.cs
index 77054897..c8490cba 100644
--- a/src/GraphicObjects/Expandable.cs
+++ b/src/GraphicObjects/Expandable.cs
@@ -22,8 +22,8 @@ namespace go
     public class Expandable : TemplatedContainer
     {		
 		bool _isExpanded;
-		Label _caption;
-		Image _image;
+		string title;
+		string image;
 		Container _contentContainer;
 
 		public event EventHandler Expand;
@@ -47,33 +47,44 @@ namespace go
 			base.loadTemplate (template);
 
 			_contentContainer = this.child.FindByName ("Content") as Container;
-			_caption = this.child.FindByName ("Caption") as Label;
-			_image = this.child.FindByName ("Image") as Image;
-
-			if (_image == null)
-				return;
-			_image.SvgSub = "collapsed";
-
-//			this.Expand += (object sender, EventArgs e) => {};
-//			this.Collapse += (object sender, EventArgs e) => {};
-
 		}
+
 		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true
 		public override bool Focusable
 		{
 			get { return base.Focusable; }
 			set { base.Focusable = value; }
 		}
+		[XmlAttributeAttribute()][DefaultValue(-1)]
+		public override int Height {
+			get { return base.Height; }
+			set { base.Height = value; }
+		}
 
 		[XmlAttributeAttribute()][DefaultValue("Expandable")]
 		public string Title {
-			get { return _caption.Text; } 
+			get { return title; } 
 			set {
-				if (_caption == null)
+				if (title == value)
 					return;
-				_caption.Text = value; 
+				title = value; 
+				NotifyValueChanged ("Title", title);
 			}
 		}        
+		[XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.expandable.svg")]
+		public string Image {
+			get { return image; } 
+			set {
+				if (image == value)
+					return;
+				image = value; 
+				NotifyValueChanged ("Image", image);
+			}
+		} 
+		[XmlAttributeAttribute()][DefaultValue("collapsed")]
+		public string SvgSub {
+			get { return IsExpanded ? "expanded" : "collapsed"; } 
+		}      
       
 		[XmlAttributeAttribute()][DefaultValue(false)]
         public bool IsExpanded
@@ -85,6 +96,7 @@ namespace go
                     return;
 
 				_isExpanded = value;
+				NotifyValueChanged ("SvgSub", SvgSub);
 
 				if (_isExpanded)
 					onExpand (this, null);
@@ -98,13 +110,11 @@ namespace go
 		public virtual void onExpand(object sender, EventArgs e)
 		{
 			_contentContainer.Visible = true;
-			_image.SvgSub = "expanded";
 			Expand.Raise (this, e);
 		}
 		public virtual void onCollapse(object sender, EventArgs e)
 		{
 			_contentContainer.Visible = false;
-			_image.SvgSub = "collapsed";
 			Collapse.Raise (this, e);
 		}
 			
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index f03a166a..41990247 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -22,8 +22,8 @@ namespace go
     public class Popper : TemplatedContainer
     {		
 		bool _isPopped;
-		Label _caption;
-		Image _image;
+		string title;
+		string image;
 		GraphicObject _content;
 
 		public event EventHandler Pop;
@@ -36,39 +36,44 @@ namespace go
 		public Popper() : base()
 		{
 		}	
-
-		protected override void loadTemplate(GraphicObject template = null)
-		{
-			base.loadTemplate (template);
-
-			_caption = this.child.FindByName ("Caption") as Label;
-			_image = this.child.FindByName ("Image") as Image;
-
-			if (_image == null)
-				return;
-			_image.SvgSub = "collapsed";
-
-			this.Pop += (object sender, EventArgs e) => {_image.SvgSub = "expanded";};
-			this.Unpop += (object sender, EventArgs e) => {_image.SvgSub = "collapsed";};
-
-		}
+			
 		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true
 		public override bool Focusable
 		{
 			get { return base.Focusable; }
 			set { base.Focusable = value; }
 		}
+		[XmlAttributeAttribute()][DefaultValue(-1)]
+		public override int Height {
+			get { return base.Height; }
+			set { base.Height = value; }
+		}
 
 		[XmlAttributeAttribute()][DefaultValue("Popper")]
 		public string Title {
-			get { return _caption.Text; } 
+			get { return title; } 
 			set {
-				if (_caption == null)
+				if (title == value)
 					return;
-				_caption.Text = value; 
+				title = value; 
+				NotifyValueChanged ("Title", title);
 			}
 		}        
-      
+		[XmlAttributeAttribute()][DefaultValue("#go.Images.Icons.expandable.svg")]
+		public string Image {
+			get { return image; } 
+			set {
+				if (image == value)
+					return;
+				image = value; 
+				NotifyValueChanged ("Image", image);
+			}
+		} 
+		[XmlAttributeAttribute()][DefaultValue("collapsed")]
+		public string SvgSub {
+			get { return IsPopped ? "expanded" : "collapsed"; } 
+		} 
+
 		[XmlAttributeAttribute()][DefaultValue(false)]
         public bool IsPopped
         {
@@ -79,16 +84,17 @@ namespace go
                     return;
 
 				_isPopped = value;
+				NotifyValueChanged ("SvgSub", SvgSub);
 
 				if (_isPopped)
 					onPop (this, null);
 				else
 					onUnpop (this, null);
 
-                registerForGraphicUpdate();
+                //registerForGraphicUpdate();
             }
         }
-
+			
 		public virtual void onPop(object sender, EventArgs e)
 		{
 			if (Content != null) {
-- 
2.47.3