From a5bc69a01ad32b2c475349166d76ac4d81b2569e Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 22 Oct 2016 00:04:35 +0200
Subject: [PATCH] debug and test 2 way binding, working ok.

---
 CrowIDE/src/MembersView.cs                    | 23 ++++++++------
 CrowIDE/ui/imlEditor.crow                     |  4 +--
 Templates/ColorPicker.template                | 28 ++++++++---------
 Tests/BasicTests.cs                           | 30 +++++++++++++++++--
 Tests/Interfaces/Divers/colorPicker.crow      |  6 ++--
 Tests/Interfaces/Divers/test2WayBinding.crow  |  5 ++++
 Tests/Interfaces/GraphicObject/2.crow         |  3 +-
 Tests/Tests.csproj                            |  3 ++
 src/CompilerServices/CompilerServices.cs      |  9 ++++--
 src/GraphicObjects/GraphicObject.cs           |  3 +-
 src/GraphicObjects/HueSelector.cs             |  2 +-
 src/GraphicObjects/SaturationValueSelector.cs |  8 +++--
 12 files changed, 87 insertions(+), 37 deletions(-)
 create mode 100755 Tests/Interfaces/Divers/test2WayBinding.crow

diff --git a/CrowIDE/src/MembersView.cs b/CrowIDE/src/MembersView.cs
index 3f250dd9..d8a76951 100644
--- a/CrowIDE/src/MembersView.cs
+++ b/CrowIDE/src/MembersView.cs
@@ -27,24 +27,29 @@ using System.Collections.Generic;
 
 namespace CrowIDE
 {
-	public class PropertyContainer : IBindable
+	public class PropertyContainer : IBindable, IValueChange
 	{
+		#region IBindable implementation
 		public object DataSource {
-			get {
-				throw new NotImplementedException ();
-			}
+			get { return null; }
 			set {
 				throw new NotImplementedException ();
 			}
 		}
-
-		#region IBindable implementation
 		List<Binding> bindings = new List<Binding> ();
 		public List<Binding> Bindings {
 			get { return bindings; }
 		}
 		#endregion
 
+		#region IValueChange implementation
+		public event EventHandler<ValueChangeEventArgs> ValueChanged;
+		public virtual void NotifyValueChanged(string MemberName, object _value)
+		{
+			ValueChanged.Raise(this, new ValueChangeEventArgs(MemberName, _value));
+		}
+		#endregion
+
 		PropertyInfo pi;
 		object instance;
 
@@ -53,7 +58,7 @@ namespace CrowIDE
 			get { return pi.GetValue(instance); }
 			set {
 				try {
-					if (pi.PropertyType != value.GetType() && pi.PropertyType != typeof(string)){
+					if (!pi.PropertyType.IsAssignableFrom(value.GetType()) && pi.PropertyType != typeof(string)){
 						if (pi.PropertyType.IsEnum) {
 							pi.SetValue (instance, value);
 						} else {
@@ -67,7 +72,7 @@ namespace CrowIDE
 				} catch (Exception ex) {
 					System.Diagnostics.Debug.WriteLine ("Error setting property:"+ ex.ToString());
 				}
-
+				NotifyValueChanged ("Value", value);
 			}
 		}
 		public string Type { get { return pi.PropertyType.IsEnum ?
@@ -86,7 +91,7 @@ namespace CrowIDE
 
 	}
 	public class MembersView : ListBox
-	{
+	{		
 		object instance;
 
 		[XmlAttributeAttribute][DefaultValue(null)]
diff --git a/CrowIDE/ui/imlEditor.crow b/CrowIDE/ui/imlEditor.crow
index d84fa6a8..ce491168 100644
--- a/CrowIDE/ui/imlEditor.crow
+++ b/CrowIDE/ui/imlEditor.crow
@@ -124,11 +124,11 @@
 							MouseEnter="{Background=UnitedNationsBlue}"
 							MouseLeave="{Background=Transparent}" >
 						<Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
-						<Popper Foreground="{²Value}" Background="White" Margin="1" Caption="{²Value}">
+						<Popper Background="White" Margin="1" Caption="{Value}">
 							<Template>
 								<HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
 									<Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
-										Background="{./Foreground}">
+										Background="{Value}">
 									</Border>
 									<Label Text="{./Caption}" Foreground="Black"/>
 								</HorizontalStack>
diff --git a/Templates/ColorPicker.template b/Templates/ColorPicker.template
index 5bf21131..e128ff71 100755
--- a/Templates/ColorPicker.template
+++ b/Templates/ColorPicker.template
@@ -17,32 +17,32 @@
 					</VerticalStack>
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Red:" Width="50"/>
-					<Spinner Style="ColorSpinner" Value="{²./R}" Width="50"  />
+					<Label Text="Red:" Width="40"/>
+					<Spinner Style="ColorSpinner" Value="{²./R}" Width="60"  />
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Green:" Width="50"/>
-					<Spinner Style="ColorSpinner" Value="{²./G}" Width="50"  />
+					<Label Text="Green:" Width="40"/>
+					<Spinner Style="ColorSpinner" Value="{²./G}" Width="60"  />
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Blue:" Width="50"/>
-					<Spinner Style="ColorSpinner" Value="{²./B}" Width="50"  />
+					<Label Text="Blue:" Width="40"/>
+					<Spinner Style="ColorSpinner" Value="{²./B}" Width="60"  />
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Alpha:" Width="50"/>
-					<Spinner Style="ColorSpinner" Value="{²./A}" Width="50"  />
+					<Label Text="Alpha:" Width="40"/>
+					<Spinner Style="ColorSpinner" Value="{²./A}" Width="60"  />
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Hue:" Width="50"/>
-					<Spinner Style="HSVSpinner" Value="{²../../../hueSelector.Hue}" Width="150"  />
+					<Label Text="Hue:" Width="40"/>
+					<Spinner Style="HSVSpinner" Value="{²../../../hueSelector.Hue}" Width="60"  />
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Sat:" Width="50"/>
-					<Spinner Style="HSVSpinner" Value="{²../../../colorSelector.S}" Width="150"  />
+					<Label Text="Sat:" Width="40"/>
+					<Spinner Style="HSVSpinner" Value="{²../../../colorSelector.S}" Width="60"  />
 				</HorizontalStack>
 				<HorizontalStack Height="Fit">
-					<Label Text="Val:" Width="50"/>
-					<Spinner Style="HSVSpinner" Value="{²../../../colorSelector.V}" Width="150"  />
+					<Label Text="Val:" Width="40"/>
+					<Spinner Style="HSVSpinner" Value="{²../../../colorSelector.V}" Width="60"  />
 				</HorizontalStack>
 			</VerticalStack>
 		</HorizontalStack>
diff --git a/Tests/BasicTests.cs b/Tests/BasicTests.cs
index cd9e3ba3..e8ba10b1 100644
--- a/Tests/BasicTests.cs
+++ b/Tests/BasicTests.cs
@@ -10,8 +10,21 @@ using System.Diagnostics;
 
 namespace Tests
 {
-	class BasicTests : OpenTKGameWindow
+	class BasicTests : OpenTKGameWindow, IBindable
 	{
+		#region IBindable implementation
+		public object DataSource {
+			get { return null; }
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		List<Binding> bindings = new List<Binding> ();
+		public List<Binding> Bindings {
+			get { return bindings; }
+		}
+		#endregion
+
 		public BasicTests ()
 			: base(800, 600,"test: press <F3> to toogle test files")
 		{
@@ -82,6 +95,17 @@ namespace Tests
 				NotifyValueChanged ("CurSources", curSources);
 			}
 		}
+		bool boolVal = true;
+		public bool BoolVal {
+			get { return boolVal; }
+			set {
+				if (boolVal == value)
+					return;
+				boolVal = value;
+				NotifyValueChanged ("BoolVal", boolVal);
+			}
+		}
+
 		#endregion
 
 		void OnClear (object sender, MouseButtonEventArgs e) => TestList = null;
@@ -94,7 +118,8 @@ namespace Tests
 
 			this.KeyDown += KeyboardKeyDown1;
 
-			testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
+			//testFiles = new string [] { @"Interfaces/Divers/colorPicker.crow" };
+			testFiles = new string [] { @"Interfaces/Divers/test2WayBinding.crow" };
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/GraphicObject", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Container", "*.crow")).ToArray ();
 			testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Group", "*.crow")).ToArray ();
@@ -108,6 +133,7 @@ namespace Tests
 
 			this.Title = testFiles [idx] + ". Press <F3> to switch example.";
 			CrowInterface.LoadInterface(testFiles[idx]).DataSource = this;
+			CompilerServices.ResolveBindings (this.Bindings);
 		}
 		void KeyboardKeyDown1 (object sender, OpenTK.Input.KeyboardKeyEventArgs e)
 		{
diff --git a/Tests/Interfaces/Divers/colorPicker.crow b/Tests/Interfaces/Divers/colorPicker.crow
index 17700afb..7a0f2801 100755
--- a/Tests/Interfaces/Divers/colorPicker.crow
+++ b/Tests/Interfaces/Divers/colorPicker.crow
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
 <VerticalStack>
-	<ColorPicker SelectedColor="DarkBlue" Name="colorPicker" Background="Onyx" Margin="5" Fit="True" />
-	<GraphicObject Width="100" Height="60" Background="{../colorPicker.SelectedColor}"/>
+	<ColorPicker SelectedColor="{²../go.Background}" Name="colorPicker" Background="Onyx" Margin="5" Fit="True" />
+	<GraphicObject Name="go" Width="100" Height="60" Background="DarkBlue"/>
+	<GraphicObject Name="go" Width="100" Height="60" Background="{../colorPicker.SelectedColor}"/>
+
 </VerticalStack>
\ No newline at end of file
diff --git a/Tests/Interfaces/Divers/test2WayBinding.crow b/Tests/Interfaces/Divers/test2WayBinding.crow
new file mode 100755
index 00000000..cf76f72b
--- /dev/null
+++ b/Tests/Interfaces/Divers/test2WayBinding.crow
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<VerticalStack Fit="true">
+	<CheckBox IsChecked="{²BoolVal}"/>
+	<CheckBox Caption="second" IsChecked="{²BoolVal}"/>
+</VerticalStack>
\ No newline at end of file
diff --git a/Tests/Interfaces/GraphicObject/2.crow b/Tests/Interfaces/GraphicObject/2.crow
index 74075b28..696cd44f 100755
--- a/Tests/Interfaces/GraphicObject/2.crow
+++ b/Tests/Interfaces/GraphicObject/2.crow
@@ -1,3 +1,4 @@
 <?xml version="1.0"?>
-<GraphicObject Margin="10" Width="50%" Height="50%" Background="Mantis"
+<GraphicObject Margin="10" Width="50%" Height="50%"
+		Background="hgradient|0:Red|0.25:Blue|0.5:Green|0.75:Yellow|1:Red"
 		MinimumSize="50,50"/>
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index e1b8e182..82fe60b0 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -304,6 +304,9 @@
     <None Include="Interfaces\Divers\colorPicker.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\Divers\test2WayBinding.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index 77666af2..384e6765 100644
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -381,8 +381,13 @@ namespace Crow
 				il.Emit (OpCodes.Pop);
 				il.Emit (OpCodes.Ret);
 
-				Delegate del = dm.CreateDelegate (eiValueChange.EventHandlerType, Bindings [0].Source.Instance);
-				miValueChangeAdd.Invoke (grouped [0].Target.Instance, new object [] { del });
+				try {
+					Delegate del = dm.CreateDelegate (eiValueChange.EventHandlerType, Bindings [0].Source.Instance);
+					miValueChangeAdd.Invoke (grouped [0].Target.Instance, new object [] { del });
+
+				} catch (Exception ex) {					
+					Debug.WriteLine ("Binding Delegate error for {0}: \n{1}", Bindings [0].Source.Instance, ex.ToString ());
+				}
 			}
 		}
 
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index d182f54a..277e3d48 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -27,7 +27,7 @@ namespace Crow
 
 		Interface currentInterface = null;
 
-		public Interface CurrentInterface {
+		[XmlIgnore]public Interface CurrentInterface {
 			get {
 				if (currentInterface == null) {
 					currentInterface = Interface.CurrentInterface;
@@ -47,6 +47,7 @@ namespace Crow
 		public event EventHandler<ValueChangeEventArgs> ValueChanged;
 		public virtual void NotifyValueChanged(string MemberName, object _value)
 		{
+			//Debug.WriteLine ("Value changed: {0}->{1} = {2}", this, MemberName, _value);
 			ValueChanged.Raise(this, new ValueChangeEventArgs(MemberName, _value));
 		}
 		#endregion
diff --git a/src/GraphicObjects/HueSelector.cs b/src/GraphicObjects/HueSelector.cs
index 11aee383..7afd6f7a 100644
--- a/src/GraphicObjects/HueSelector.cs
+++ b/src/GraphicObjects/HueSelector.cs
@@ -104,7 +104,7 @@ namespace Crow
 
 			CairoHelpers.CairoRectangle (ctx, r, 2);
 			ctx.SetSourceColor (Color.White);
-			ctx.LineWidth = 1.0;
+			ctx.LineWidth = 2.0;
 			ctx.Stroke();
 			ctx.Restore ();
 		}
diff --git a/src/GraphicObjects/SaturationValueSelector.cs b/src/GraphicObjects/SaturationValueSelector.cs
index 54a765b8..b71fa7ef 100644
--- a/src/GraphicObjects/SaturationValueSelector.cs
+++ b/src/GraphicObjects/SaturationValueSelector.cs
@@ -65,9 +65,11 @@ namespace Crow
 			Rectangle rGrad = r;
 			rGrad.Inflate (-1);
 
-			Foreground.SetAsSource (gr, r);
-			CairoHelpers.CairoRectangle (gr, r, CornerRadius);
-			gr.Fill();
+			if (Foreground != null) {//TODO:test if null should be removed
+				Foreground.SetAsSource (gr, r);
+				CairoHelpers.CairoRectangle (gr, r, CornerRadius);
+				gr.Fill ();
+			}
 
 			Crow.Gradient grad = new Gradient (Gradient.Type.Horizontal);
 			grad.Stops.Add (new Gradient.ColorStop (0, new Color (1, 1, 1, 1)));
-- 
2.47.3