From dfe1b846ad7fbcaad07f9083a0e1773ba0bcffbd Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Sat, 30 Jul 2016 19:45:38 +0200 Subject: [PATCH] =?utf8?q?change=20style=20values=20from=20string=20to=20o?= =?utf8?q?bject=20to=20be=20able=20to=20store=20dynMehods=20=09modifi?= =?utf8?q?=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20src/CompilerServices/Com?= =?utf8?q?pilerServices.cs=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20?= =?utf8?q?=20=20src/GraphicObjects/GraphicObject.cs=20=09modifi=C3=A9?= =?utf8?q?=C2=A0:=20=20=20=20=20=20=20=20=20src/Interface.cs=20=09modifi?= =?utf8?q?=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20src/StyleReader.cs?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/CompilerServices/CompilerServices.cs | 1 + src/GraphicObjects/GraphicObject.cs | 2 +- src/Interface.cs | 4 ++-- src/StyleReader.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) 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 bindings = null; if (!resolved.TryGetValue (b.Target.Instance, out bindings)) { bindings = new List (); 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> styling = new List>(); + List> styling = new List>(); //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 LayoutingQueue = new Queue (); public Queue GraphicUpdateQueue = new Queue(); - public Dictionary> Styling; + public Dictionary> 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> (); + Styling = new Dictionary> (); //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 (); + iface.Styling [tc] = new Dictionary (); else if (iface.Styling [tc].ContainsKey (currentProperty)) continue; iface.Styling [tc] [currentProperty] = expression; -- 2.47.3