From 8f082608ed86c6027cb88539d40d005189fa1cf6 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 22 Jul 2020 01:51:21 +0300 Subject: Improved procedure designer. Added support for static variables. Added full results support for designer. Added BitmapResult. Added System.Windows.Forms / Drawing as default usings. --- .../Tango.Scripting.Editors/Intellisense/KnownType.cs | 8 +++++++- .../Scripting/Tango.Scripting.Editors/ScriptEditor.cs | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors') diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs index 3dc465541..3dc796152 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Intellisense/KnownType.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using System.Drawing; using System.IO; using System.Linq; using System.Reflection; @@ -182,7 +183,12 @@ namespace Tango.Scripting.Editors.Intellisense //Load Properties { - var properties = Type.GetProperties(BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.Instance).ToList(); + if (Type == typeof(Color)) + { + + } + + var properties = Type.GetProperties(BindingFlags.FlattenHierarchy | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static).ToList(); for (int i = 0; i < properties.Count; i++) { diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs index 3ceecae4b..71a455f86 100644 --- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs +++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs @@ -1114,6 +1114,11 @@ namespace Tango.Scripting.Editors return knownType; } } + else + { + //Maybe static... + return _knownTypes.FirstOrDefault(x => x.Name == variableName); + } } } @@ -1165,6 +1170,11 @@ namespace Tango.Scripting.Editors return declaredType; } } + else + { + //Maybe static... + return _declaredTypes.FirstOrDefault(x => x.Name == variableName); + } } } -- cgit v1.3.1