From 8d543b42826995b35fdf8416e3a19fb4d3a0aa11 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Tue, 15 Sep 2015 01:38:48 +0200
Subject: [PATCH] Implement TemplatedWidth and TemplatedHeight PropertyLess
 bindings to propagate sizing policy inside template

---
 Templates/Checkbox.goml                |  8 +++--
 Templates/Expandable.goml              | 10 +++---
 Templates/Listbox.goml                 |  4 +--
 Templates/MessageBox.goml              | 29 ++++++++--------
 Templates/Popper.goml                  |  6 ++--
 Templates/RadioButton.goml             |  4 +--
 Templates/Spinner.goml                 |  8 ++---
 Templates/Window.goml                  | 13 ++++----
 Tests/GOLIBTests.cs                    |  2 +-
 Tests/Interfaces/testCheckbox.goml     |  2 +-
 Tests/Interfaces/testMsgBox.goml       |  2 +-
 Tests/Interfaces/testWindow.goml       |  8 ++---
 src/GraphicObjects/Checkbox.cs         | 10 +++---
 src/GraphicObjects/TemplatedControl.cs | 46 +++++++++++++++++++++-----
 src/GraphicObjects/Window.cs           | 36 ++++++++++----------
 15 files changed, 110 insertions(+), 78 deletions(-)

diff --git a/Templates/Checkbox.goml b/Templates/Checkbox.goml
index 10ec033f..130b0193 100755
--- a/Templates/Checkbox.goml
+++ b/Templates/Checkbox.goml
@@ -1,5 +1,9 @@
 <?xml version="1.0"?>
-<HorizontalStack Spacing="1" Height="-1" Width="0">
-	<Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub}"/>
+<!--<HorizontalStack Spacing="1" Height="-1" Width="0">
+	<Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub2}"/>
 	<Label Text="{Caption}" Width="0"/>
+</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/Expandable.goml b/Templates/Expandable.goml
index 79544dbe..844cacb4 100755
--- a/Templates/Expandable.goml
+++ b/Templates/Expandable.goml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray"  Height="-1" Width="0" MouseClick="onMouseClick">
-	<VerticalStack Height="-1" Width="0">
-		<HorizontalStack Spacing="1" Height="-1" Width="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="0"/>
+			<Label Text="{Title}" Width="{TemplatedWidth}"/>
 		</HorizontalStack>
-		<Container Name="Content" Visible="false"/>
+		<Container Name="Content" Visible="false" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>
 	</VerticalStack>
 </Border>
\ No newline at end of file
diff --git a/Templates/Listbox.goml b/Templates/Listbox.goml
index 08b650d5..0e5f70b6 100755
--- a/Templates/Listbox.goml
+++ b/Templates/Listbox.goml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" Margin="1" MinimumSize="0;100" Fit="True" Background="Gray">
-	<VerticalStack Name="List" Margin="1" VerticalAlignment="Top"/>
+<Border BorderWidth="1" Margin="1" MinimumSize="0;100" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Background="Gray">
+	<VerticalStack Name="List" Margin="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>
 </Border>
\ No newline at end of file
diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml
index 7f48fa65..6488deb9 100644
--- a/Templates/MessageBox.goml
+++ b/Templates/MessageBox.goml
@@ -1,29 +1,28 @@
 <?xml version="1.0"?>
-<Border Height="-1" BorderWidth="1" BorderColor="White" CornerRadius="10" >
-	<VerticalStack Height="-1" Background="0,4;0,4;0,4;0,4">
-		<Border BorderWidth="1" BorderColor="White"  Height="18" Background="0,1;0,5;1,0;0,5">
-			<HorizontalStack Name="hs" Margin="1" Spacing="1" Height="-1" >
-				<GraphicObject Width="5"/>
-				<Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>
-				<Label Foreground="White" Width="0" Text="{Title}" Margin="1" TextAlignment="Center" />
-				<Border CornerRadius="6" BorderWidth="1" Margin="0" BorderColor="Transparent"  Height="12" Width="12"
+<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" >
+				<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}" />
+				<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"/>
 				</Border>
-				<GraphicObject Width="5"/>
+				<GraphicObject Width="5" Height="5"/>
 			</HorizontalStack>
 		</Border>
-<!--		<Container Name="Content"/>-->
-		<HorizontalStack Spacing="10">
-			<GraphicObject Width="20"/>
+		<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" Width="0" Height="80" Text="{Message}"
+			<TextRun Font="serif, 12" Height="{TemplatedHeight}" Width="{TemplatedWidth}" Text="{Message}"
 				Multiline="true" WordWrap="true"/>		
 		</HorizontalStack>
-		<HorizontalStack Height="-1" Margin="5">
-			<GraphicObject/>
+		<HorizontalStack Height="-1" Width="{TemplatedWidth}" Margin="5">
+			<GraphicObject Height="5"/>
 			<Button Text="Ok"/>
 			<Button Text="Cancel"/>
 		</HorizontalStack>
diff --git a/Templates/Popper.goml b/Templates/Popper.goml
index a935404f..534c677f 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 Spacing="1" Height="-1" >
+<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="0"/>
+		<Label Text="{Title}"  Width="{TemplatedWidth}"/>
 	</HorizontalStack>
 </Border>
\ No newline at end of file
diff --git a/Templates/RadioButton.goml b/Templates/RadioButton.goml
index 10ec033f..44e66817 100755
--- a/Templates/RadioButton.goml
+++ b/Templates/RadioButton.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<HorizontalStack Spacing="1" Height="-1" Width="0">
+<HorizontalStack Spacing="1" Height="{TemplatedHeight}" Width="{TemplatedWidth}">
 	<Image Margin="2" Width="14" Height="14" Path="{Image}" SvgSub="{SvgSub}"/>
-	<Label Text="{Caption}" Width="0"/>
+	<Label Text="{Caption}" Height="{TemplatedHeight}" Width="{TemplatedWidth}"/>
 </HorizontalStack>
\ No newline at end of file
diff --git a/Templates/Spinner.goml b/Templates/Spinner.goml
index 59897fe3..f9bc82b1 100755
--- a/Templates/Spinner.goml
+++ b/Templates/Spinner.goml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" Width="{Width}" Height="{Height}" Background="White">
-	<HorizontalStack Name="hstack" Margin="0" Spacing="2" Width="{Width}" Height="{Height}">
-		<Label Foreground="DimGray" Width="0" Height="{Height}" Name="labCpt" 
+<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="-1" Spacing="1" >
+		<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>
diff --git a/Templates/Window.goml b/Templates/Window.goml
index 46e82390..d6f08cde 100755
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="White" CornerRadius="20">
-	<VerticalStack Height="0">
-		<Border BorderWidth="1" BorderColor="White"  Height="-1" Background="0,1;0,5;1,0;0,5">
-			<HorizontalStack Name="hs" Margin="1" Spacing="1" 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" >
 				<GraphicObject Width="5"/>
 				<Image Margin="1" Width="12" Height="12" Path="{Icon}"/>
-				<Label Foreground="White" Width="0" Margin="1" TextAlignment="Center" Text="{Title}" />
+				<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"
@@ -14,6 +15,6 @@
 				<GraphicObject Width="5"/>
 			</HorizontalStack>
 		</Border>
-		<Container Name="Content" 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
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 38eaf869..2585ad6c 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -31,6 +31,7 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"testCheckbox.goml",
 			"testWindow.goml",
 			"test0.goml",
 			"test1.goml",
@@ -38,7 +39,6 @@ namespace test
 			"test1.2.goml",
 			"testLabel.goml",
 			"testContainer.goml",
-			"testCheckbox.goml",
 			"testRadioButton.goml",
 			"testSpinner.goml",
 			"testPopper.goml",
diff --git a/Tests/Interfaces/testCheckbox.goml b/Tests/Interfaces/testCheckbox.goml
index 4a0288cd..7f5078a5 100755
--- a/Tests/Interfaces/testCheckbox.goml
+++ b/Tests/Interfaces/testCheckbox.goml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
-<Checkbox Caption="Checkbox" Background="DimGray"/>
+<Checkbox Width="100" Height="-1" Caption="Checkbox" Background="DimGray"/>
 
diff --git a/Tests/Interfaces/testMsgBox.goml b/Tests/Interfaces/testMsgBox.goml
index c1beef52..9cd0e339 100755
--- a/Tests/Interfaces/testMsgBox.goml
+++ b/Tests/Interfaces/testMsgBox.goml
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<MessageBox/>
\ No newline at end of file
+<MessageBox Width="200" Height="-1"/>
\ No newline at end of file
diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
index e6589bd5..1f5cf4e4 100755
--- a/Tests/Interfaces/testWindow.goml
+++ b/Tests/Interfaces/testWindow.goml
@@ -11,10 +11,10 @@
 			<Checkbox Height="-1" Width="80"/>
 		</HorizontalStack>
 		<GroupBox Text="test"  Height="-1" Width="0" Margin="5">
-			<VerticalStack  Height="-1" Width="0">
-				<RadioButton  Caption="Radio 1"/>
-				<RadioButton  Caption="Radio 2" IsChecked="true"/>
-				<RadioButton  Caption="Radio 3"/>
+			<VerticalStack  Height="-1" Width="0" >
+				<RadioButton  Caption="Radio 1" Background="Red" />
+				<RadioButton  Caption="Radio 2" IsChecked="true" />
+				<RadioButton  Caption="Radio 3" />
 			</VerticalStack>
 		</GroupBox>
 <!--		<Checkbox Height="-1" Width="-1" Background="Red" Margin="0" VerticalAlignment="Center" HorizontalAlignment="Right"/>-->
diff --git a/src/GraphicObjects/Checkbox.cs b/src/GraphicObjects/Checkbox.cs
index d4deb171..b6796659 100644
--- a/src/GraphicObjects/Checkbox.cs
+++ b/src/GraphicObjects/Checkbox.cs
@@ -31,11 +31,11 @@ namespace go
 
 
 		#region GraphicObject overrides
-		[XmlAttributeAttribute()][DefaultValue(-1)]
-		public override int Height {
-			get { return base.Height; }
-			set { base.Height = value; }
-		}
+//		[XmlAttributeAttribute()][DefaultValue(-1)]
+//		public override int Height {
+//			get { return base.Height; }
+//			set { base.Height = value; }
+//		}
 		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true
 		public override bool Focusable
 		{
diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index 37da50cf..ca3ed68c 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -60,14 +60,31 @@ namespace go
 //			set { _templatePath = value; }
 //		}
 
-
-		protected virtual void loadTemplate(GraphicObject template = null)
-		{
-			if (template == null) {
-				DefaultTemplate dt = (DefaultTemplate)this.GetType ().GetCustomAttributes (typeof(DefaultTemplate), true).FirstOrDefault();
-				this.SetChild (Interface.Load (dt.Path, this));
-			}else
-				this.SetChild (template);
+		#region GraphicObject overrides
+		[XmlAttributeAttribute()][DefaultValue(-1)]
+		public override int Width {
+			get { return base.Width; }
+			set { 
+				base.Width = value; 
+				//PropertyLess binding for sizing policy in template
+				if (base.Width < 1) //send size policy to template elements
+					NotifyValueChanged ("TemplatedWidth", base.Width);
+				else //stretched in control if size is fixed
+					NotifyValueChanged ("TemplatedWidth", 0);
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue(-1)]
+		public override int Height {
+			get { return base.Height; }
+			set { 
+				base.Height = value; 
+
+				//PropertyLess binding for sizing policy in template
+				if (base.Height < 1) //send size policy to template elements
+					NotifyValueChanged ("TemplatedHeight", base.Height);
+				else //stretched in control if size is fixed
+					NotifyValueChanged ("TemplatedHeight", 0);
+			}
 		}
 
 		protected override void loadDefaultValues ()
@@ -76,12 +93,23 @@ namespace go
 				loadTemplate ();
 			base.loadDefaultValues ();
 		}
-
 		public override GraphicObject FindByName (string nameToFind)
 		{
 			//prevent name searching in template
 			return nameToFind == this.Name ? this : null;
 		}
+		#endregion
+
+		protected virtual void loadTemplate(GraphicObject template = null)
+		{
+			if (template == null) {
+				DefaultTemplate dt = (DefaultTemplate)this.GetType ().GetCustomAttributes (typeof(DefaultTemplate), true).FirstOrDefault();
+				this.SetChild (Interface.Load (dt.Path, this));
+			}else
+				this.SetChild (template);
+		}
+
+
 
 		#region IXmlSerializable
 
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 18ea1fd4..cbe1cc9b 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -9,9 +9,27 @@ namespace go
 	[DefaultTemplate("#go.Templates.Window.goml")]
 	public class Window : TemplatedContainer
 	{
+		enum Direction
+		{
+			None,
+			N,
+			S,
+			E,
+			W,
+			NW,
+			NE,
+			SW,
+			SE,
+		}
+
 		string _title;
 		string _icon;
 		Container _contentContainer;
+		Direction currentDirection = Direction.None;
+
+		#region CTOR
+		public Window () : base() {}
+		#endregion
 
 		#region GraphicObject overrides
 		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true
@@ -46,25 +64,7 @@ namespace go
 				NotifyValueChanged ("Icon", _icon);
 			}
 		} 
-
-		public Window () : base()
-		{
-		}
 			
-		enum Direction
-		{
-			None,
-			N,
-			S,
-			E,
-			W,
-			NW,
-			NE,
-			SW,
-			SE,
-		}
-		Direction currentDirection = Direction.None;
-
 		public override void onMouseMove (object sender, MouseMoveEventArgs e)
 		{
 			base.onMouseMove (sender, e);
-- 
2.47.3