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 1fff4e7d67d21493b7b0c07dbf0672e88ac71dc4..4a85c442aae109dca193ec5eb64e45b7cc0aeaf0 100644 (file)
--- 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 1863dccd56ab76cf49bd3dafb744e2d9cef1d97b..a24b5763d4f3c5d886854c0f6f6e11173ef902e2 100644 (file)
--- 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 b8b06918cc03093823260da7866655a0007d7191..a83a5305f29ba9fccb9ad2f3504062cb890f7583 100644 (file)
--- 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 5060b3d98c154d13eac81223ab68dcdd4f5f90a4..0c4ce2bc6c9f86db7d5bc4d471ded2f3c92ef2a7 100644 (file)
--- 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;