From 0128eebf85f3a0c29b2e6b63f966ddd27205818c Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 6 Jun 2015 11:37:41 +0200
Subject: [PATCH] - generic conversion through Parse method for custom type xml
 attribute

---
 Templates/ItemTemplate.goml          |  8 ++--
 Templates/Listbox.goml               |  4 +-
 Tests/Tests.csproj                   |  2 +-
 src/GraphicObjects/Container.cs      |  2 +-
 src/GraphicObjects/GraphicObject.cs  | 55 ++++++++++++++--------------
 src/GraphicObjects/Image.cs          |  1 +
 src/GraphicObjects/Label.cs          |  7 +++-
 src/GraphicObjects/NumericControl.cs |  2 +-
 src/LayoutingQueueItem.cs            |  2 +-
 9 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/Templates/ItemTemplate.goml b/Templates/ItemTemplate.goml
index c35332e9..aa1b7371 100755
--- a/Templates/ItemTemplate.goml
+++ b/Templates/ItemTemplate.goml
@@ -1,5 +1,7 @@
 <?xml version="1.0"?>
-<Label Margin="2" Focusable="true" Text="{}" 
-	MouseEnter="{Background=SteelBlue}"
-	MouseLeave="{Background=Transparent}"
+
+<Label Text="{}" Focusable="true" Fit="true" Margin="0"
+		MouseEnter="{Background=SteelBlue}"
+		MouseLeave="{Background=Transparent}"
 />
+
diff --git a/Templates/Listbox.goml b/Templates/Listbox.goml
index 4a661db0..452877c3 100755
--- a/Templates/Listbox.goml
+++ b/Templates/Listbox.goml
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<Border Margin="2" MinimumSize="0;200" Fit="True" Background="Gray">
-	<VerticalStack Name="List" Margin="0"/>
+<Border Margin="0" MinimumSize="0;200" Fit="True" Background="Gray">
+	<VerticalStack Name="List" Margin="1" VerticalAlignment="Top"/>
 </Border>
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index d19fb844..fc1ad786 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_Listbox</StartupObject>
+    <StartupObject>test.GOLIBTest_4</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
diff --git a/src/GraphicObjects/Container.cs b/src/GraphicObjects/Container.cs
index 298f1873..66e3b9e4 100644
--- a/src/GraphicObjects/Container.cs
+++ b/src/GraphicObjects/Container.cs
@@ -63,7 +63,7 @@ namespace go
 		}
 		protected override Size measureRawSize ()
 		{			
-			return child == null ? Bounds.Size : new Size(child.Slot.Width + 2 * (Margin),child.Slot.Height + 2 * (Margin));
+			return child == null ? Bounds.Size : new Size(child.Slot.Width + 2 * Margin, child.Slot.Height + 2 * (Margin));
 		}
 
 		protected override void OnLayoutChanges (LayoutingType layoutType)
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 0a402f12..9e55d1cf 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -213,7 +213,7 @@ namespace go
 				registerForGraphicUpdate ();
 			}
 		}
-		[XmlAttributeAttribute()][DefaultValue(2)]
+		[XmlAttributeAttribute()][DefaultValue(2.0)]
 		public virtual double CornerRadius {
 			get { return _cornerRadius; }
 			set {
@@ -314,23 +314,21 @@ namespace go
 
 					DefaultValueAttribute dv = o as DefaultValueAttribute;
 					if (dv != null) {
-						if (pi.PropertyType == typeof(Color))
-							pi.SetValue (this, Color.Parse ((string)dv.Value), null);
-						else if (pi.PropertyType == typeof(Font))
-							pi.SetValue (this, Font.Parse ((string)dv.Value), null);
-						else if (pi.PropertyType == typeof(Picture))
-							pi.SetValue (this, Picture.Parse ((string)dv.Value), null);
-						else if (pi.PropertyType == typeof(Size))
-							pi.SetValue (this, Size.Parse ((string)dv.Value), null);
-						else
-							pi.SetValue (this, dv.Value, null);
-						continue;
-					}
-
-					//Debug.WriteLine (o.ToString ());
+						object defaultValue = dv.Value;
+						//avoid system types automaticaly converted by parser
+						if (defaultValue != null && !pi.PropertyType.Namespace.StartsWith("System")) {
+							if (pi.PropertyType != defaultValue.GetType()) {
+								MethodInfo miParse = pi.PropertyType.GetMethod ("Parse", BindingFlags.Static | BindingFlags.Public);
+								if (miParse != null) {									
+									pi.SetValue (this, miParse.Invoke (null, new object[]{ defaultValue }), null);
+									continue;
+								}
+							}
+						}
+						pi.SetValue (this, defaultValue, null);	
+					}						
 				}
 			}
-
 		}
 
 		public virtual GraphicObject FindByName(string nameToFind){
@@ -749,18 +747,21 @@ namespace go
 					string v = reader.GetAttribute (name);
 
 					if (string.IsNullOrEmpty (v)) {
-						//TODO: maybe find another way to convert correctely colors default values
-						if (pi.PropertyType == typeof(Color))
-							pi.SetValue (this, Color.Parse ((string)defaultValue), null);
-						else if (pi.PropertyType == typeof(Font))
-							pi.SetValue (this, Font.Parse ((string)defaultValue), null);
-						else if (pi.PropertyType == typeof(Picture))
-							pi.SetValue (this, Picture.Parse ((string)defaultValue), null);
-						else if (pi.PropertyType == typeof(Size))
-							pi.SetValue (this, Size.Parse ((string)defaultValue), null);
-						else
-							pi.SetValue (this, defaultValue, null);
+						//avoid system types automaticaly converted by parser
+						if (defaultValue != null && !pi.PropertyType.Namespace.StartsWith("System")) {
+							if (pi.PropertyType != defaultValue.GetType()) {
+								MethodInfo miParse = pi.PropertyType.GetMethod ("Parse", BindingFlags.Static | BindingFlags.Public);
+								if (miParse != null) {									
+									pi.SetValue (this, miParse.Invoke (null, new object[]{ defaultValue }), null);
+									continue;
+								}
+							}
+						}
+
+						pi.SetValue (this, defaultValue, null);
+
 					} else {
+						
 						if (v.StartsWith("{")) {
 							//binding
 							if (!v.EndsWith("}"))
diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs
index 2cb70446..9806c992 100755
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Image.cs
@@ -20,6 +20,7 @@ namespace go
 			get { return _pic == null ? null : _pic.Path; }
 			set {				
 				LoadImage (value);
+				_pic.KeepProportions = true;
 			}
 		}
 
diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs
index c128929f..1e5332ca 100755
--- a/src/GraphicObjects/Label.cs
+++ b/src/GraphicObjects/Label.cs
@@ -405,14 +405,16 @@ namespace go
 			if (HasFocus)
 			{
 				//TODO:
-				gr.Color = Color.White;
+				gr.Color = Foreground;
 				gr.LineWidth = 1.5;
 				gr.MoveTo(new PointD(textCursorPos + rText.X, rText.Y + currentLine * fe.Height));
 				gr.LineTo(new PointD(textCursorPos + rText.X, rText.Y + (currentLine + 1) * fe.Height));
 				gr.Stroke();
 			}
 			#endregion
-				
+
+			//*******************
+			//debug selection
 //			gr.Color = Color.Green;
 //			Rectangle R = new Rectangle(
 //				rText.X +  (int)SelEndCursorPos-10,
@@ -429,6 +431,7 @@ namespace go
 //				(int)fe.Height);
 //			gr.Rectangle(R);
 //			gr.Fill();
+			//*******************
 
 			gr.FontMatrix = new Matrix(widthRatio * Font.Size, 0, 0, heightRatio * Font.Size, 0, 0);
 
diff --git a/src/GraphicObjects/NumericControl.cs b/src/GraphicObjects/NumericControl.cs
index c904712b..247b4e92 100644
--- a/src/GraphicObjects/NumericControl.cs
+++ b/src/GraphicObjects/NumericControl.cs
@@ -34,7 +34,7 @@ namespace go
 		#endregion
 
 		#region public properties
-		[XmlAttributeAttribute()][DefaultValue(0)]
+		[XmlAttributeAttribute()][DefaultValue(0.0)]
 		public virtual double Minimum {
 			get { return minValue; }
 			set {
diff --git a/src/LayoutingQueueItem.cs b/src/LayoutingQueueItem.cs
index b028fb83..e1d21792 100644
--- a/src/LayoutingQueueItem.cs
+++ b/src/LayoutingQueueItem.cs
@@ -47,7 +47,7 @@ namespace go
 		}
 		public void ProcessLayouting()
 		{
-			//Debug.WriteLine ("Layouting => " + this.ToString ());
+			Debug.WriteLine ("Layouting => " + this.ToString ());
 			try {
 				GraphicObject.UpdateLayout (LayoutType);
 			} catch (Exception ex) {
-- 
2.47.3