From: jpbruyere <jp.bruyere@hotmail.com>
Date: Sat, 30 Jul 2016 17:45:38 +0000 (+0200)
Subject: change style values from string to object to be able to store dynMehods
X-Git-Tag: v0.4~24^2~3
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=dfe1b846ad7fbcaad07f9083a0e1773ba0bcffbd;p=jp%2Fcrow.git

change style values from string to object to be able to store dynMehods
	modifié :         src/CompilerServices/CompilerServices.cs
	modifié :         src/GraphicObjects/GraphicObject.cs
	modifié :         src/Interface.cs
	modifié :         src/StyleReader.cs
---

diff --git a/src/CompilerServices/CompilerServices.cs b/src/CompilerServices/CompilerServices.cs
index 1fff4e7d..4a85c442 100644
--- a/src/CompilerServices/CompilerServices.cs
+++ b/src/CompilerServices/CompilerServices.cs
@@ -56,6 +56,7 @@ namespace Crow
 				if (!b.FindTarget ())
 					continue;
 
+				//group Bindings by target instanceq
 				List<Binding> bindings = null;
 				if (!resolved.TryGetValue (b.Target.Instance, out bindings)) {
 					bindings = new List<Binding> ();
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 1863dccd..a24b5763 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -509,7 +509,7 @@ namespace Crow
 				return;
 			}
 
-			List<Dictionary<string, string>> styling = new List<Dictionary<string, string>>();
+			List<Dictionary<string, object>> styling = new List<Dictionary<string, object>>();
 
 			//Search for a style mathing :
 			//1: Full class name, with full namespace
diff --git a/src/Interface.cs b/src/Interface.cs
index b8b06918..a83a5305 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -90,7 +90,7 @@ namespace Crow
 
 		public Queue<LayoutingQueueItem> LayoutingQueue = new Queue<LayoutingQueueItem> ();
 		public Queue<GraphicObject> GraphicUpdateQueue = new Queue<GraphicObject>();
-		public Dictionary<string, Dictionary<string, string>> Styling;
+		public Dictionary<string, Dictionary<string, object>> Styling;
 		public string Clipboard;
 		public static void RegisterForGraphicUpdate(GraphicObject g)
 		{
@@ -269,7 +269,7 @@ namespace Crow
 			System.Globalization.CultureInfo savedCulture = Thread.CurrentThread.CurrentCulture;
 			Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InvariantCulture;
 
-			Styling = new Dictionary<string, Dictionary<string, string>> ();
+			Styling = new Dictionary<string, Dictionary<string, object>> ();
 
 			//fetch styling info in this order, if member styling is alreadey referenced in previous
 			//assembly, it's ignored.
diff --git a/src/StyleReader.cs b/src/StyleReader.cs
index 5060b3d9..0c4ce2bc 100644
--- a/src/StyleReader.cs
+++ b/src/StyleReader.cs
@@ -106,7 +106,7 @@ namespace Crow
 
 								foreach (string tc in targetsClasses) {
 									if (!iface.Styling.ContainsKey (tc))
-										iface.Styling [tc] = new Dictionary<string, string> ();
+										iface.Styling [tc] = new Dictionary<string, object> ();
 									else if (iface.Styling [tc].ContainsKey (currentProperty))
 										continue;
 									iface.Styling [tc] [currentProperty] = expression;