From ced2c01be01a7c3c7d2952fe7bf9f0513bf64a0e Mon Sep 17 00:00:00 2001 From: jpbruyere Date: Fri, 24 Apr 2015 10:04:15 +0200 Subject: OpenTK as submodule \nInterface static class --- src/GraphicObjects/Checkbox.cs | 2 +- src/GraphicObjects/GraphicObject.cs | 125 +----------------------------------- src/GraphicObjects/Label.cs | 14 ++-- 3 files changed, 12 insertions(+), 129 deletions(-) (limited to 'src/GraphicObjects') diff --git a/src/GraphicObjects/Checkbox.cs b/src/GraphicObjects/Checkbox.cs index 68704127..91f8e451 100755 --- a/src/GraphicObjects/Checkbox.cs +++ b/src/GraphicObjects/Checkbox.cs @@ -242,7 +242,7 @@ namespace go public override void ReadXml(System.Xml.XmlReader reader) { string handler = reader.GetAttribute("OnClick"); - GraphicObject.EventsToResolve.Add(new EventSource + Interface.EventsToResolve.Add(new EventSource { Source = this, Handler = handler, diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs index 3f6bbc85..3ffda14a 100755 --- a/src/GraphicObjects/GraphicObject.cs +++ b/src/GraphicObjects/GraphicObject.cs @@ -54,11 +54,6 @@ namespace go bool yIsValid = false; #endregion - public static int TabSize = 4; - public static string LineBreak = "\r\n"; - public static bool ReplaceTabsWithSpace = false; - public static bool DesignerMode = false; - #region public fields public Rectangle Bounds; public Rectangle Slot = new Rectangle (); @@ -249,7 +244,7 @@ namespace go } [XmlAttributeAttribute()][DefaultValue(false)] public virtual bool Focusable { - get { return _focusable | DesignerMode; } + get { return _focusable | Interface.DesignerMode; } set { _focusable = value; } } [XmlAttributeAttribute()][DefaultValue("Transparent")] @@ -593,122 +588,6 @@ namespace go } #endregion - #region Load/Save - - internal static List EventsToResolve; - - public static void Save(string file, T graphicObject) - { - XmlSerializerNamespaces xn = new XmlSerializerNamespaces(); - xn.Add("", ""); - XmlSerializer xs = new XmlSerializer(typeof(T)); - - xs = new XmlSerializer(typeof(T)); - using (Stream s = new FileStream(file, FileMode.Create)) - { - xs.Serialize(s, graphicObject, xn); - } - } - public static GraphicObject Load(string path) - { - string root = "Object"; - using (Stream s = new FileStream (path, FileMode.Open)) { - using (XmlReader reader = XmlReader.Create (s)) { - while (reader.Read()) { - // first element is the root element - if (reader.NodeType == XmlNodeType.Element) { - root = reader.Name; - break; - } - } - } - } - Type t = Type.GetType("go." + root); - var go = Activator.CreateInstance(t); - return Load(path, t); - } - public static void Load(string file, out T result, object ClassContainingHandlers = null) - { - EventsToResolve = new List(); - - XmlSerializerNamespaces xn = new XmlSerializerNamespaces(); - xn.Add("", ""); - XmlSerializer xs = new XmlSerializer(typeof(T)); - - using (Stream s = new FileStream(file, FileMode.Open)) - { - result = (T)xs.Deserialize(s); - } - - if (ClassContainingHandlers == null) - return; - - foreach (EventSource es in EventsToResolve) - { - if (string.IsNullOrEmpty(es.Handler)) - continue; - - if (es.Handler.StartsWith ("{")) { - CompilerServices.CompileEventSource (es); - } else { - MethodInfo mi = ClassContainingHandlers.GetType ().GetMethod (es.Handler, BindingFlags.NonPublic | BindingFlags.Public - | BindingFlags.Instance); - - if (mi == null) { - Debug.WriteLine ("Handler Method not found: " + es.Handler); - continue; - } - - FieldInfo fi = CompilerServices.getEventHandlerField (es.Source.GetType (), es.EventName); - Delegate del = Delegate.CreateDelegate(fi.FieldType, ClassContainingHandlers, mi); - fi.SetValue(es.Source, del); - } - } - } - - public static GraphicObject Load(string file, Type type, object ClassContainingHandlers = null) - { - GraphicObject result; - EventsToResolve = new List(); - - XmlSerializerNamespaces xn = new XmlSerializerNamespaces(); - xn.Add("", ""); - XmlSerializer xs = new XmlSerializer(type); - - using (Stream s = new FileStream(file, FileMode.Open)) - { - result = (GraphicObject)xs.Deserialize(s); - } - - if (ClassContainingHandlers == null) - return result; - - foreach (EventSource es in EventsToResolve) - { - if (string.IsNullOrEmpty(es.Handler)) - continue; - - if (es.Handler.StartsWith ("{")) { - CompilerServices.CompileEventSource (es); - } else { - MethodInfo mi = ClassContainingHandlers.GetType ().GetMethod (es.Handler, BindingFlags.NonPublic | BindingFlags.Public - | BindingFlags.Instance); - - if (mi == null) { - Debug.WriteLine ("Handler Method not found: " + es.Handler); - continue; - } - - FieldInfo fi = CompilerServices.getEventHandlerField (es.Source.GetType (), es.EventName); - Delegate del = Delegate.CreateDelegate(fi.FieldType, ClassContainingHandlers, mi); - fi.SetValue(es.Source, del); - } - } - return result; - } - - #endregion - public override string ToString () { return Name == "unamed" ? this.GetType ().ToString() : Name; @@ -732,7 +611,7 @@ namespace go if (string.IsNullOrEmpty (handler)) continue; - GraphicObject.EventsToResolve.Add(new EventSource + Interface.EventsToResolve.Add(new EventSource { Source = this, Handler = handler, diff --git a/src/GraphicObjects/Label.cs b/src/GraphicObjects/Label.cs index aa93a7e9..ee62a266 100755 --- a/src/GraphicObjects/Label.cs +++ b/src/GraphicObjects/Label.cs @@ -78,7 +78,7 @@ namespace go { get { return lines == null ? - _text : lines.Aggregate((i, j) => i + GraphicObject.LineBreak + j); + _text : lines.Aggregate((i, j) => i + Interface.LineBreak + j); } set { @@ -247,7 +247,7 @@ namespace go te = new TextExtents(); foreach (string s in lines) { - string l = s.Replace("\t", new String (' ', GraphicObject.TabSize)); + string l = s.Replace("\t", new String (' ', Interface.TabSize)); #if _WIN32 || _WIN64 TextExtents tmp = gr.TextExtents(str.ToUtf8()); @@ -432,7 +432,7 @@ namespace go gr.FontMatrix = new Matrix(widthRatio * Font.Size, 0, 0, heightRatio * Font.Size, 0, 0); for (int i = 0; i < lines.Count; i++) { - string l = lines [i].Replace ("\t", new String (' ', GraphicObject.TabSize)); + string l = lines [i].Replace ("\t", new String (' ', Interface.TabSize)); if (selRelease >= 0 && i >= selectionStart.Y && i <= selectionEnd.Y) { gr.Color = selColor; int lineLength = (int)gr.TextExtents (l).XAdvance; @@ -536,11 +536,15 @@ namespace go currentLine = (int)(mouseLocalPos.Y / fe.Height); + //fix cu + if (currentLine >= lines.Count) + currentLine = lines.Count - 1; + for (int i = 0; i < lines[currentLine].Length; i++) { string c = lines [currentLine].Substring (i, 1); if (c == "\t") - c = new string (' ', GraphicObject.TabSize); + c = new string (' ', Interface.TabSize); #if _WIN32 || _WIN64 byte[] c = System.Text.UTF8Encoding.UTF8.GetBytes(Text.Substring(i, 1)); @@ -590,7 +594,7 @@ namespace go { string c = lines [currentLine].Substring (i, 1); if (c == "\t") - c = new string (' ', GraphicObject.TabSize); + c = new string (' ', Interface.TabSize); #if _WIN32 || _WIN64 byte[] c = System.Text.UTF8Encoding.UTF8.GetBytes(Text.Substring(i, 1)); te = gr.TextExtents(c); -- cgit v1.3.1-4-g156e