1.7.2

unstrip fixes

.gitignore

@@ -9,6 +9,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*/mcs-unity*
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

README.md

@@ -1,7 +1,7 @@
 # CppExplorer [![Version](https://img.shields.io/badge/MelonLoader-0.2.7.1-green.svg)](https://github.com/HerpDerpinstine/MelonLoader)
 
 <p align="center">
-  <img align="center" src="https://sinai-dev.github.io/images/thumbs/02.png">
+  <img align="center" src="icon.png">
 </p>
 
 <p align="center">
@@ -13,36 +13,50 @@
  
   <img src="https://img.shields.io/github/downloads/sinai-dev/CppExplorer/total.svg" />
 </p>
+<p align="center">   
+  <a href="https://github.com/sinai-dev/MonoExplorer">Looking for a Mono version?</a>
+</p>
 
 ### Known issues
 * CppExplorer may experience a `MissingMethodException` when trying to use certain UnityEngine methods. If you experience this, please open an issue and I will do my best to fix it.
+* Reflection may fail with certain types (eg. `Nullable<T>`, some Dictionary types, etc). Please see [Il2CppAssemblyUnhollower](https://github.com/knah/Il2CppAssemblyUnhollower#known-issues) for more details.
 * Scrolling with mouse wheel in the CppExplorer menu may not work on all games at the moment.
 
 ## How to install
 
 Requires [MelonLoader](https://github.com/HerpDerpinstine/MelonLoader) to be installed for your game.
 
-1. Download <b>CppExplorer.zip</b> from [Releases](https://github.com/sinaioutlander/CppExplorer/releases).
+1. Download <b>CppExplorer.zip</b> from [Releases](https://github.com/sinai-dev/CppExplorer/releases).
 2. Unzip the file into the `Mods` folder in your game's installation directory, created by MelonLoader.
 3. Make sure it's not in a sub-folder, `CppExplorer.dll` and `mcs.dll` should be directly in the `Mods\` folder.
 
 ## How to use
 
 * Press F7 to show or hide the menu.
-* Simply browse through the scene, search for objects, etc, most of it is pretty self-explanatory.
+* Use the Scene Explorer or the Object Search to start Exploring, or the C# Console to test some code.
+* See below for more specific details.
 
-### Features
-[![](img.png)](img.png)
+### Mod Config
+
+There is a simple Mod Config for the CppExplorer, which is generated the first time you run it.
+
+This config is generated to `Mods\CppExplorer\config.xml`. Edit the config while the game is closed if you wish to change it.
+
+`Main_Menu_Toggle` (KeyCode)
+* Sets the keybinding for the Main Menu toggle (show/hide all CppExplorer windows)
+* See [this article](https://docs.unity3d.com/ScriptReference/KeyCode.html) for a full list of all accepted KeyCodes.
+* Default: `F7`
+
+`Default_Window_Size` (Vector2)
+* Sets the default width and height for all CppExplorer windows when created.
+* `x` is width, `y` is height.
+* Default: `<x>550</x> <y>700</y>`
+
+## Features
+[![](overview.png)](overview.png)
 
 <i>An overview of the different CppExplorer menus.</i>
 
-* Scene hierarchy explorer
-* Search loaded assets with filters
-* Traverse and manipulate GameObjects
-* Generic Reflection inspector
-* C# REPL Console
-* Inspect-under-mouse
-
 ### Scene Explorer
 
 * A simple menu which allows you to traverse the Transform heirarchy of the scene.
@@ -91,10 +105,21 @@ CppExplorer can force the mouse to be visible and unlocked when the menu is open
 * For Hellpoint, use [HPExplorerMouseControl](https://github.com/sinai-dev/Hellpoint-Mods/tree/master/HPExplorerMouseControl/HPExplorerMouseControl)
 * You can create your own plugin using one of the two plugins above as an example. Usually only a few simple Harmony patches are needed to fix the problem.
 
+## Building
+
+If you'd like to build this yourself, everything you need (other than MelonLoader) is included with this repository, there is no need for recursive cloning etc.
+
+1. Install MelonLoader for your game.
+2. Open the `src\CppExplorer.csproj` file in a text editor.
+3. Scroll down until you see the `<ItemGroup>` containing the References.
+4. Fix all of the paths in the `..\Steam\` directory for your game (use the full path if you need to).
+5. Open the `src\CppExplorer.sln` project and build it.
+6. The dll is built to the `Release\` folder in the root of the repository.
+
 ## Credits
 
 Written by Sinai.
 
 Thanks to:
 * [ManlyMarco](https://github.com/ManlyMarco) for their [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor), which I used for the REPL Console and the "Find instances" snippet, and the UI style.
-* [denikson](https://github.com/denikson) for [mcs-unity](https://github.com/denikson/mcs-unity). I commented out the `SkipVisibilityExt` constructor in `mcs.dll` since it was causing an exception with the Hook it attempted.
+* [denikson](https://github.com/denikson) for [mcs-unity](https://github.com/denikson/mcs-unity). I commented out the `SkipVisibilityExt` constructor since it was causing an exception with the Hook it attempted.

src/CachedObjects/CacheObjectBase.cs

@@ -19,8 +19,12 @@ namespace Explorer
         public MemberInfo MemInfo { get; set; }
         public Type DeclaringType { get; set; }
         public object DeclaringInstance { get; set; }
-        public int PropertyIndex { get; private set; }
-        private string m_propertyIndexInput = "0";
+
+        public bool HasParameters => m_arguments != null && m_arguments.Length > 0;
+        public bool m_evaluated = false;
+        public bool m_isEvaluating;
+        public ParameterInfo[] m_arguments = new ParameterInfo[0];
+        public string[] m_argumentInput = new string[0];
 
         public string ReflectionException { get; set; }
 
@@ -40,14 +44,10 @@ namespace Explorer
             }
         }
 
-        // ===== Abstract/Virtual Methods ===== //
-
         public virtual void Init() { }
 
         public abstract void DrawValue(Rect window, float width);
 
-        // ===== Static Methods ===== //
-
         /// <summary>
         /// Get CacheObject from only an object instance
         /// Calls GetCacheObject(obj, memberInfo, declaringInstance) with (obj, null, null)</summary>
@@ -114,12 +114,21 @@ namespace Explorer
         {
             CacheObjectBase holder;
 
+            var pi = memberInfo as PropertyInfo;
+            var mi = memberInfo as MethodInfo;
+
+            // if PropertyInfo, check if can process args
+            if (pi != null && !CanProcessArgs(pi.GetIndexParameters()))
+            {
+                return null;
+            }
+
             // This is pretty ugly, could probably make a cleaner implementation.
             // However, the only cleaner ways I can think of are slower and probably not worth it. 
 
             // Note: the order is somewhat important.
 
-            if (memberInfo is MethodInfo mi)
+            if (mi != null)
             {
                 if (CacheMethod.CanEvaluate(mi))
                 {
@@ -163,7 +172,7 @@ namespace Explorer
             {
                 holder = new CacheDictionary();
             }
-            else if (ReflectionHelpers.IsEnumerable(valueType) || ReflectionHelpers.IsCppList(valueType))
+            else if (ReflectionHelpers.IsEnumerable(valueType) || ReflectionHelpers.IsCppEnumerable(valueType))
             {
                 holder = new CacheList();
             }
@@ -181,24 +190,112 @@ namespace Explorer
                 holder.MemInfo = memberInfo;
                 holder.DeclaringType = memberInfo.DeclaringType;
                 holder.DeclaringInstance = declaringInstance;
-
-                holder.UpdateValue();
             }
 
+            if (pi != null)
+            {
+                holder.m_arguments = pi.GetIndexParameters();
+            }
+            else if (mi != null)
+            {
+                holder.m_arguments = mi.GetParameters();
+            }
+
+            holder.m_argumentInput = new string[holder.m_arguments.Length];
+            
+            holder.UpdateValue();
+
             holder.Init();
 
             return holder;
         }
 
-        // ======== Instance Methods =========
+        public static bool CanProcessArgs(ParameterInfo[] parameters)
+        {
+            foreach (var param in parameters)
+            {
+                if (!param.ParameterType.IsPrimitive && param.ParameterType != typeof(string))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public float CalcWhitespace(Rect window)
+        {
+            if (!(this is IExpandHeight)) return 0f;
+
+            float whitespace = (this as IExpandHeight).WhiteSpace;
+            if (whitespace > 0)
+            {
+                ClampLabelWidth(window, ref whitespace);
+            }
+
+            return whitespace;
+        }
+
+        public object[] ParseArguments()
+        {
+            var parsedArgs = new List<object>();
+            for (int i = 0; i < m_arguments.Length; i++)
+            {
+                var input = m_argumentInput[i];
+                var type = m_arguments[i].ParameterType;
+
+                if (!string.IsNullOrEmpty(input))
+                {
+                    // strings can obviously just be used directly
+                    if (type == typeof(string))
+                    {
+                        parsedArgs.Add(input);
+                        continue;
+                    }
+                    else
+                    {
+                        // try to invoke the parse method and use that.
+                        try
+                        {
+                            parsedArgs.Add(type.GetMethod("Parse", new Type[] { typeof(string) })
+                                               .Invoke(null, new object[] { input }));
+
+                            continue;
+                        }
+                        catch
+                        {
+                            MelonLogger.Log($"Argument #{i} '{m_arguments[i].Name}' ({type.Name}), could not parse input '{input}'.");
+                        }
+                    }
+                }
+
+                // Didn't use input, see if there is a default value.
+                if (m_arguments[i].HasDefaultValue)
+                {
+                    parsedArgs.Add(m_arguments[i].DefaultValue);
+                    continue;
+                }
+
+                // Try add a null arg I guess
+                parsedArgs.Add(null);
+            }
+
+            return parsedArgs.ToArray();
+        }
 
         public virtual void UpdateValue()
         {
-            if (MemInfo == null || !string.IsNullOrEmpty(ReflectionException))
+            if (MemInfo == null)
             {
                 return;
             }
 
+            if (HasParameters && !m_isEvaluating)
+            {
+                // Need to enter parameters first
+                return;
+            }
+
             try
             {
                 if (MemInfo.MemberType == MemberTypes.Field)
@@ -209,13 +306,11 @@ namespace Explorer
                 else if (MemInfo.MemberType == MemberTypes.Property)
                 {
                     var pi = MemInfo as PropertyInfo;
-                    bool isStatic = pi.GetAccessors()[0].IsStatic;
-                    var target = isStatic ? null : DeclaringInstance;
+                    var target = pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance;
 
-                    if (pi.GetIndexParameters().Length > 0)
+                    if (HasParameters)
                     {
-                        var indexes = new object[] { PropertyIndex };
-                        Value = pi.GetValue(target, indexes);
+                        Value = pi.GetValue(target, ParseArguments());
                     }
                     else
                     {
@@ -224,6 +319,8 @@ namespace Explorer
                 }
 
                 ReflectionException = null;
+                m_evaluated = true;
+                m_isEvaluating = false;
             }
             catch (Exception e)
             {
@@ -244,10 +341,9 @@ namespace Explorer
                 {
                     var pi = MemInfo as PropertyInfo;
 
-                    if (pi.GetIndexParameters().Length > 0)
+                    if (HasParameters)
                     {
-                        var indexes = new object[] { PropertyIndex };
-                        pi.SetValue(pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance, Value, indexes);
+                        pi.SetValue(pi.GetAccessors()[0].IsStatic ? null : DeclaringInstance, Value, ParseArguments());
                     }
                     else
                     {
@@ -261,9 +357,10 @@ namespace Explorer
             }
         }
 
-        // ========= Instance Gui Draw ==========
+        // ========= Gui Draw ==========
 
         public const float MAX_LABEL_WIDTH = 400f;
+        public const string EVALUATE_LABEL = "<color=lime>Evaluate</color>";
 
         public static void ClampLabelWidth(Rect window, ref float labelWidth)
         {
@@ -282,53 +379,104 @@ namespace Explorer
 
             if (MemInfo != null)
             {
-                var name = RichTextName;
-                if (MemInfo is PropertyInfo pi && pi.GetIndexParameters().Length > 0)
-                {
-                    name += $"[{PropertyIndex}]";
-                }
-
-                GUILayout.Label(name, new GUILayoutOption[] { GUILayout.Width(labelWidth) });
+                GUIUnstrip.Label(RichTextName, new GUILayoutOption[] { GUILayout.Width(labelWidth) });
             }
             else
             {
-                GUILayout.Space(labelWidth);
+                GUIUnstrip.Space(labelWidth);
+            }
+
+            var cm = this as CacheMethod;
+
+            if (HasParameters)
+            {
+                GUIUnstrip.BeginVertical();
+
+                if (m_isEvaluating)
+                {
+                    for (int i = 0; i < m_arguments.Length; i++)
+                    {
+                        var name = m_arguments[i].Name;
+                        var input = m_argumentInput[i];
+                        var type = m_arguments[i].ParameterType.Name;
+
+                        var label = "<color=#2df7b2>" + type + "</color> <color=#a6e9e9>" + name + "</color>";
+                        if (m_arguments[i].HasDefaultValue)
+                        {
+                            label = $"<i>[{label} = {m_arguments[i].DefaultValue}]</i>";
+                        }
+
+                        GUIUnstrip.BeginHorizontal();
+
+                        GUIUnstrip.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(20) });
+                        m_argumentInput[i] = GUIUnstrip.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
+                        GUIUnstrip.Label(label);
+
+                        GUIUnstrip.EndHorizontal();
+                    }
+
+                    GUIUnstrip.BeginHorizontal();
+                    if (GUIUnstrip.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                    {
+                        if (cm != null)
+                        {
+                            cm.Evaluate();
+                        }
+                        else
+                        {
+                            UpdateValue();
+                        }
+                    }
+                    if (GUIUnstrip.Button("Cancel", new GUILayoutOption[] { GUILayout.Width(70) }))
+                    {
+                        m_isEvaluating = false;
+                    }
+                    GUIUnstrip.EndHorizontal();
+                }
+                else
+                {
+                    if (GUIUnstrip.Button($"Evaluate ({m_arguments.Length} params)", new GUILayoutOption[] { GUILayout.Width(150) }))
+                    {
+                        m_isEvaluating = true;
+                    }
+                }
+
+                GUIUnstrip.EndVertical();
+
+                // new line and space
+                GUIUnstrip.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(labelWidth);
+            }
+            else if (cm != null)
+            {
+                //GUIUnstrip.BeginHorizontal();
+
+                if (GUIUnstrip.Button(EVALUATE_LABEL, new GUILayoutOption[] { GUILayout.Width(70) }))
+                {
+                    cm.Evaluate();
+                }
+
+                // new line and space
+                GUIUnstrip.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(labelWidth);
             }
 
             if (!string.IsNullOrEmpty(ReflectionException))
             {
-                GUILayout.Label("<color=red>Reflection failed!</color> (" + ReflectionException + ")", null);
+                GUIUnstrip.Label("<color=red>Reflection failed!</color> (" + ReflectionException + ")");
             }
-            else if (Value == null && MemInfo?.MemberType != MemberTypes.Method)
+            else if ((HasParameters || this is CacheMethod) && !m_evaluated)
             {
-                GUILayout.Label("<i>null (" + ValueTypeName + ")</i>", null);
+                GUIUnstrip.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=#2df7b2>{ValueTypeName}</color>)");
+            }
+            else if (Value == null && !(this is CacheMethod))
+            {
+                GUIUnstrip.Label("<i>null (" + ValueTypeName + ")</i>");
             }
             else
             {
-                if (MemInfo is PropertyInfo pi && pi.GetIndexParameters().Length > 0)
-                {
-                    GUILayout.Label("index:", new GUILayoutOption[] { GUILayout.Width(50) });
-
-                    m_propertyIndexInput = GUILayout.TextField(m_propertyIndexInput, new GUILayoutOption[] { GUILayout.Width(100) });
-                    if (GUILayout.Button("Set", new GUILayoutOption[] { GUILayout.Width(60) }))
-                    {
-                        if (int.TryParse(m_propertyIndexInput, out int i))
-                        {
-                            PropertyIndex = i;
-                            UpdateValue();
-                        }
-                        else
-                        {
-                            MelonLogger.Log($"Could not parse '{m_propertyIndexInput}' to an int!");
-                        }
-                    }
-
-                    // new line and space
-                    GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
-                    GUILayout.Space(labelWidth);
-                }
-
                 DrawValue(window, window.width - labelWidth - 90);
             }
         }
@@ -348,15 +496,15 @@ namespace Explorer
 
             m_richTextName = $"<color=#2df7b2>{MemInfo.DeclaringType.Name}</color>.<color={memberColor}>{MemInfo.Name}</color>";
 
-            if (MemInfo is MethodInfo mi)
+            if (m_arguments.Length > 0 || this is CacheMethod)
             {
                 m_richTextName += "(";
                 var _params = "";
-                foreach (var param in mi.GetParameters())
+                foreach (var param in m_arguments)
                 {
                     if (_params != "") _params += ", ";
 
-                    _params += $"<color=#a6e9e9>{param.Name}</color>";
+                    _params += $"<color=#2df7b2>{param.ParameterType.Name}</color> <color=#a6e9e9>{param.Name}</color>";
                 }
                 m_richTextName += _params;
                 m_richTextName += ")";

src/CachedObjects/IExpandHeight.cs

@@ -9,8 +9,6 @@ namespace Explorer
     interface IExpandHeight
     {
         bool IsExpanded { get; set; }
-
-        float WhiteSpace { get; set; }
-        float ButtonWidthOffset { get; set; }
+        float WhiteSpace { get; set; }        
     }
 }

src/CachedObjects/Object/CacheDictionary.cs

@@ -15,7 +15,6 @@ namespace Explorer
     {
         public bool IsExpanded { get; set; }
         public float WhiteSpace { get; set; } = 215f;
-        public float ButtonWidthOffset { get; set; } = 290f;
 
         public PageHelper Pages = new PageHelper();
 
@@ -126,6 +125,10 @@ namespace Explorer
                     m_keysType = type.GetGenericArguments()[0];
                     m_valuesType = type.GetGenericArguments()[1];
                 }
+                else
+                {
+                    MelonLogger.Log("TODO? Dictionary is of type: " + Value.GetType().FullName);
+                }
             }
         }
 
@@ -152,7 +155,6 @@ namespace Explorer
             foreach (var key in IDict.Keys)
             {
                 var cache = GetCacheObject(key, TypeOfKeys);
-                cache.UpdateValue();
                 keys.Add(cache);
             }
 
@@ -160,7 +162,6 @@ namespace Explorer
             foreach (var val in IDict.Values)
             {
                 var cache = GetCacheObject(val, TypeOfValues);
-                cache.UpdateValue();
                 values.Add(cache);
             }
 
@@ -170,6 +171,11 @@ namespace Explorer
 
         private bool EnsureDictionaryIsSupported()
         {
+            if (typeof(IDictionary).IsAssignableFrom(ValueType))
+            {
+                return true;
+            }
+
             try
             {
                 return Check(TypeOfKeys) && Check(TypeOfValues);
@@ -196,69 +202,67 @@ namespace Explorer
         {
             if (m_cachedKeys == null || m_cachedValues == null)
             {
-                GUILayout.Label("Cached keys or values is null!", null);
+                GUIUnstrip.Label("Cached keys or values is null!");
                 return;
             }
 
+            var whitespace = CalcWhitespace(window);
+
             int count = m_cachedKeys.Length;
 
             if (!IsExpanded)
             {
-                if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
                 {
                     IsExpanded = true;
                 }
             }
             else
             {
-                if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
                 {
                     IsExpanded = false;
                 }
             }
 
+            var negativeWhitespace = window.width - (whitespace + 100f);
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            string btnLabel = $"<color=yellow>[{count}] Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
-            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(window.width - ButtonWidthOffset) }))
+            string btnLabel = $"[{count}] <color=#2df7b2>Dictionary<{TypeOfKeys.FullName}, {TypeOfValues.FullName}></color>";
+            if (GUIUnstrip.Button(btnLabel, new GUILayoutOption[] { GUILayout.Width(negativeWhitespace) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }
             GUI.skin.button.alignment = TextAnchor.MiddleCenter;
 
-            GUILayout.Space(5);
+            GUIUnstrip.Space(5);
 
             if (IsExpanded)
             {
-                float whitespace = WhiteSpace;
-                if (whitespace > 0)
-                {
-                    ClampLabelWidth(window, ref whitespace);
-                }
-
                 Pages.ItemCount = count;
 
                 if (count > Pages.ItemsPerPage)
                 {
-                    GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
+                    GUIUnstrip.EndHorizontal();
+                    GUIUnstrip.BeginHorizontal();
 
-                    GUILayout.Space(whitespace);
+                    GUIUnstrip.Space(whitespace);
 
                     Pages.CurrentPageLabel();
 
                     // prev/next page buttons
-                    if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
                     {
                         Pages.TurnPage(Turn.Left);
                     }
-                    if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
                     {
                         Pages.TurnPage(Turn.Right);
                     }
 
                     Pages.DrawLimitInputArea();
 
-                    GUILayout.Space(5);
+                    GUIUnstrip.Space(5);
                 }
 
                 int offset = Pages.CalculateOffsetIndex();
@@ -269,24 +273,24 @@ namespace Explorer
                     var val = m_cachedValues[i];
 
                     //collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
-                    GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
+                    GUIUnstrip.EndHorizontal();
+                    GUIUnstrip.BeginHorizontal();
 
-                    //GUILayout.Space(whitespace);
+                    //GUIUnstrip.Space(whitespace);
 
                     if (key == null || val == null)
                     {
-                        GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", null);
+                        GUIUnstrip.Label($"[{i}] <i><color=grey>(null)</color></i>");
                     }
                     else
                     {
                         GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                        GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
+                        GUIUnstrip.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
 
-                        GUILayout.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
+                        GUIUnstrip.Label("Key:", new GUILayoutOption[] { GUILayout.Width(40) });
                         key.DrawValue(window, (window.width / 2) - 30f);
 
-                        GUILayout.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
+                        GUIUnstrip.Label("Value:", new GUILayoutOption[] { GUILayout.Width(40) });
                         val.DrawValue(window, (window.width / 2) - 30f);
                     }
 

src/CachedObjects/Object/CacheList.cs

@@ -12,7 +12,6 @@ namespace Explorer
     {
         public bool IsExpanded { get; set; }
         public float WhiteSpace { get; set; } = 215f;
-        public float ButtonWidthOffset { get; set; } = 290f;
 
         public PageHelper Pages = new PageHelper();
 
@@ -41,7 +40,7 @@ namespace Explorer
         private Type m_genericTypeDef;
 
         // Cached ToArray method for Lists
-        public MethodInfo GenericToArrayMethod
+        public MethodInfo CppListToArrayMethod
         {
             get => GetGenericToArrayMethod();
         }
@@ -61,7 +60,7 @@ namespace Explorer
         {
             if (m_enumerable == null && Value != null)
             {
-                m_enumerable = Value as IEnumerable ?? GetEnumerableFromIl2CppList();
+                m_enumerable = Value as IEnumerable ?? EnumerateWithReflection();
             }
             return m_enumerable;
         }
@@ -101,21 +100,45 @@ namespace Explorer
             return m_itemProperty;
         }
 
-        private IEnumerable GetEnumerableFromIl2CppList()
+        private IEnumerable EnumerateWithReflection()
         {
             if (Value == null) return null;
 
             if (GenericTypeDef == typeof(Il2CppSystem.Collections.Generic.List<>))
             {
-                return (IEnumerable)GenericToArrayMethod?.Invoke(Value, new object[0]);
+                return (IEnumerable)CppListToArrayMethod?.Invoke(Value, new object[0]);
+            }
+            else if (GenericTypeDef == typeof(Il2CppSystem.Collections.Generic.HashSet<>))
+            {
+                return CppHashSetToMono();
             }
             else
             {
-                return ConvertIListToMono();
+                return CppIListToMono();
             }
         }
 
-        private IList ConvertIListToMono()
+        private IEnumerable CppHashSetToMono()
+        {
+            var set = new HashSet<object>();
+
+            // invoke GetEnumerator
+            var enumerator = Value.GetType().GetMethod("GetEnumerator").Invoke(Value, null);
+            // get the type of it
+            var enumeratorType = enumerator.GetType();
+            // reflect MoveNext and Current
+            var moveNext = enumeratorType.GetMethod("MoveNext");
+            var current = enumeratorType.GetProperty("Current");
+            // iterate
+            while ((bool)moveNext.Invoke(enumerator, null))
+            {
+                set.Add(current.GetValue(enumerator));
+            }
+
+            return set;
+        }
+
+        private IList CppIListToMono()
         {
             try
             {
@@ -219,7 +242,6 @@ namespace Explorer
 
                     if (GetCacheObject(obj, t) is CacheObjectBase cached)
                     {
-                        cached.UpdateValue();
                         list.Add(cached);
                     }
                     else
@@ -242,69 +264,67 @@ namespace Explorer
         {
             if (m_cachedEntries == null)
             {
-                GUILayout.Label("m_cachedEntries is null!", null);
+                GUIUnstrip.Label("m_cachedEntries is null!");
                 return;
             }
 
+            var whitespace = CalcWhitespace(window);
+
             int count = m_cachedEntries.Length;
 
             if (!IsExpanded)
             {
-                if (GUILayout.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
                 {
                     IsExpanded = true;
                 }
             }
             else
             {
-                if (GUILayout.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
                 {
                     IsExpanded = false;
                 }
             }
 
+            var negativeWhitespace = window.width - (whitespace + 100f);
+
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            string btnLabel = "<color=yellow>[" + count + "] " + EntryType.FullName + "</color>";
-            if (GUILayout.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(window.width - ButtonWidthOffset) }))
+            string btnLabel = $"[{count}] <color=#2df7b2>{EntryType.FullName}</color>";
+            if (GUIUnstrip.Button(btnLabel, new GUILayoutOption[] { GUILayout.MaxWidth(negativeWhitespace) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }
             GUI.skin.button.alignment = TextAnchor.MiddleCenter;
 
-            GUILayout.Space(5);
+            GUIUnstrip.Space(5);
 
             if (IsExpanded)
             {
-                float whitespace = WhiteSpace;                
-                if (whitespace > 0)
-                {
-                    ClampLabelWidth(window, ref whitespace);
-                }
-
                 Pages.ItemCount = count;
 
                 if (count > Pages.ItemsPerPage)
                 {
-                    GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
+                    GUIUnstrip.EndHorizontal();
+                    GUIUnstrip.BeginHorizontal();
 
-                    GUILayout.Space(whitespace);
+                    GUIUnstrip.Space(whitespace);
                  
                     Pages.CurrentPageLabel();
 
                     // prev/next page buttons
-                    if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(60) }))
                     {
                         Pages.TurnPage(Turn.Left);
                     }
-                    if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(60) }))
                     {
                         Pages.TurnPage(Turn.Right);
                     }
 
                     Pages.DrawLimitInputArea();
 
-                    GUILayout.Space(5);
+                    GUIUnstrip.Space(5);
                 }
 
                 int offset = Pages.CalculateOffsetIndex();
@@ -314,19 +334,19 @@ namespace Explorer
                     var entry = m_cachedEntries[i];
 
                     //collapsing the BeginHorizontal called from ReflectionWindow.WindowFunction or previous array entry
-                    GUILayout.EndHorizontal();
-                    GUILayout.BeginHorizontal(null);
+                    GUIUnstrip.EndHorizontal();
+                    GUIUnstrip.BeginHorizontal();
 
-                    GUILayout.Space(whitespace);
+                    GUIUnstrip.Space(whitespace);
 
                     if (entry == null || entry.Value == null)
                     {
-                        GUILayout.Label($"[{i}] <i><color=grey>(null)</color></i>", null);
+                        GUIUnstrip.Label($"[{i}] <i><color=grey>(null)</color></i>");
                     }
                     else
                     {
                         GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                        GUILayout.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
+                        GUIUnstrip.Label($"[{i}]", new GUILayoutOption[] { GUILayout.Width(30) });
 
                         entry.DrawValue(window, window.width - (whitespace + 85));                        
                     }

src/CachedObjects/Other/CacheMethod.cs

@@ -11,15 +11,8 @@ namespace Explorer
 {
     public class CacheMethod : CacheObjectBase
     {
-        private bool m_evaluated = false;
         private CacheObjectBase m_cachedReturnValue;
 
-        private bool m_isEvaluating;
-        private ParameterInfo[] m_arguments;
-        private string[] m_argumentInput;
-
-        public bool HasParameters => m_arguments != null && m_arguments.Length > 0;
-
         public static bool CanEvaluate(MethodInfo mi)
         {
             // TODO generic args
@@ -29,25 +22,7 @@ namespace Explorer
             }
 
             // primitive and string args supported
-            foreach (var param in mi.GetParameters())
-            {
-                if (!param.ParameterType.IsPrimitive && param.ParameterType != typeof(string))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        public override void Init()
-        {
-            base.Init();
-
-            var mi = MemInfo as MethodInfo;
-
-            m_arguments = mi.GetParameters();
-            m_argumentInput = new string[m_arguments.Length];
+            return CanProcessArgs(mi.GetParameters());
         }
 
         public override void UpdateValue()
@@ -55,10 +30,11 @@ namespace Explorer
             //base.UpdateValue();
         }
 
-        private void Evaluate()
+        public void Evaluate()
         {
-            var mi = MemInfo as MethodInfo;
+            m_isEvaluating = false;
 
+            var mi = MemInfo as MethodInfo;
             object ret = null;
 
             if (!HasParameters)
@@ -68,42 +44,9 @@ namespace Explorer
             }
             else
             {
-                var parsedArgs = new List<object>();
-                for (int i = 0; i < m_arguments.Length; i++)
-                {
-                    var input = m_argumentInput[i];
-                    var type = m_arguments[i].ParameterType;
-
-                    if (type == typeof(string))
-                    {
-                        parsedArgs.Add(input);
-                    }
-                    else
-                    {
-                        try
-                        {
-                            if (type.GetMethod("Parse", new Type[] { typeof(string) }).Invoke(null, new object[] { input }) is object parsed)
-                            {
-                                parsedArgs.Add(parsed);
-                            }
-                            else
-                            {
-                                // try add a null arg i guess
-                                parsedArgs.Add(null);
-                            }
-
-                        }
-                        catch
-                        {
-                            MelonLogger.Log($"Unable to parse '{input}' to type '{type.Name}'");
-                            break;
-                        }
-                    }
-                }
-
                 try
                 {
-                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, parsedArgs.ToArray());
+                    ret = mi.Invoke(mi.IsStatic ? null : DeclaringInstance, ParseArguments());
                     m_evaluated = true;
                 }
                 catch (Exception e)
@@ -115,13 +58,6 @@ namespace Explorer
             if (ret != null)
             {
                 m_cachedReturnValue = GetCacheObject(ret);
-
-                if (m_cachedReturnValue is IExpandHeight expander)
-                {
-                    expander.WhiteSpace = 0f;
-                    expander.ButtonWidthOffset += 70f;
-                }
-
                 m_cachedReturnValue.UpdateValue();
             }
             else
@@ -134,58 +70,6 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.BeginVertical(null);
-
-            string evaluateLabel = "<color=lime>Evaluate</color>";
-            if (HasParameters)
-            {
-                if (m_isEvaluating)
-                {
-                    for (int i = 0; i < m_arguments.Length; i++)
-                    {
-                        var name = m_arguments[i].Name;
-                        var input = m_argumentInput[i];
-                        var type = m_arguments[i].ParameterType.Name;
-
-                        GUILayout.BeginHorizontal(null);
-                        m_argumentInput[i] = GUILayout.TextField(input, new GUILayoutOption[] { GUILayout.Width(150) });
-                        GUILayout.Label(i + ": <color=cyan>" + name + "</color> <color=yellow>(" + type + ")</color>", null);
-
-                        GUILayout.EndHorizontal();
-                    }
-
-                    GUILayout.BeginHorizontal(null);
-                    if (GUILayout.Button(evaluateLabel, new GUILayoutOption[] { GUILayout.Width(70) }))
-                    {
-                        Evaluate();
-                        m_isEvaluating = false;
-                    }
-                    if (GUILayout.Button("Cancel", new GUILayoutOption[] { GUILayout.Width(70) }))
-                    {
-                        m_isEvaluating = false;
-                    }
-                }
-                else
-                {
-                    GUILayout.BeginHorizontal(null);
-                    if (GUILayout.Button($"Evaluate ({m_arguments.Length} params)", new GUILayoutOption[] { GUILayout.Width(150) }))
-                    {
-                        m_isEvaluating = true;
-                    }
-                }
-            }
-            else
-            {
-                GUILayout.BeginHorizontal(null);
-                if (GUILayout.Button(evaluateLabel, new GUILayoutOption[] { GUILayout.Width(70) }))
-                {
-                    Evaluate();
-                }
-            }
-            
-            GUILayout.EndHorizontal();
-
-            GUILayout.BeginHorizontal(null);
             if (m_evaluated)
             {
                 if (m_cachedReturnValue != null)
@@ -194,16 +78,13 @@ namespace Explorer
                 }
                 else
                 {
-                    GUILayout.Label($"null (<color=yellow>{ValueTypeName}</color>)", null);
+                    GUIUnstrip.Label($"null (<color=#2df7b2>{ValueTypeName}</color>)");
                 }
             }
             else
             {
-                GUILayout.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=yellow>{ValueTypeName}</color>)", null);
+                GUIUnstrip.Label($"<color=grey><i>Not yet evaluated</i></color> (<color=#2df7b2>{ValueTypeName}</color>)");
             }
-            GUILayout.EndHorizontal();
-
-            GUILayout.EndVertical();
         }
     }
 }

src/CachedObjects/Other/CacheOther.cs

@@ -42,15 +42,20 @@ namespace Explorer
             
             if (!label.Contains(ValueTypeName))
             {
-                label += $" ({ValueTypeName})";
+                label += $" (<color=#2df7b2>{ValueTypeName}</color>)";
             }
+            else
+            {
+                label = label.Replace(ValueTypeName, $"<color=#2df7b2>{ValueTypeName}</color>");
+            }
+
             if (Value is UnityEngine.Object unityObj && !label.Contains(unityObj.name))
             {
                 label = unityObj.name + " | " + label;
             }
 
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
-            if (GUILayout.Button("<color=yellow>" + label + "</color>", new GUILayoutOption[] { GUILayout.Width(width - 15) }))
+            if (GUIUnstrip.Button(label, new GUILayoutOption[] { GUILayout.Width(width - 15) }))
             {
                 WindowManager.InspectObject(Value, out bool _);
             }

src/CachedObjects/Struct/CacheColor.cs

@@ -7,13 +7,16 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheColor : CacheObjectBase
+    public class CacheColor : CacheObjectBase, IExpandHeight
     {
         private string r = "0";
         private string g = "0";
         private string b = "0";
         private string a = "0";
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
         public override void UpdateValue()
         {
             base.UpdateValue();
@@ -28,47 +31,69 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Color</color>: {((Color)Value).ToString()}", null);
-
             if (CanWrite)
             {
-                GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+                if (!IsExpanded)
+                {
+                    if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("R:", new GUILayoutOption[] { GUILayout.Width(30) });
-                r = GUILayout.TextField(r, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+            //var c = (Color)Value;
+            //GUI.color = c;
+            GUIUnstrip.Label($"<color=#2df7b2>Color:</color> {((Color)Value).ToString()}");
+            //GUI.color = Color.white;
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("G:", new GUILayoutOption[] { GUILayout.Width(30) });
-                g = GUILayout.TextField(g, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+            if (CanWrite && IsExpanded)
+            {
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("B:", new GUILayoutOption[] { GUILayout.Width(30) });
-                b = GUILayout.TextField(b, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                var whitespace = CalcWhitespace(window);
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("A:", new GUILayoutOption[] { GUILayout.Width(30) });
-                a = GUILayout.TextField(a, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("R:", new GUILayoutOption[] { GUILayout.Width(30) });
+                r = GUIUnstrip.TextField(r, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("G:", new GUILayoutOption[] { GUILayout.Width(30) });
+                g = GUIUnstrip.TextField(g, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("B:", new GUILayoutOption[] { GUILayout.Width(30) });
+                b = GUIUnstrip.TextField(b, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("A:", new GUILayoutOption[] { GUILayout.Width(30) });
+                a = GUIUnstrip.TextField(a, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
 
                 // draw set value button
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                if (GUIUnstrip.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
                 {
                     SetValueFromInput();
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
             }
         }
 

src/CachedObjects/Struct/CacheEnum.cs

@@ -39,19 +39,19 @@ namespace Explorer
         {
             if (CanWrite)
             {
-                if (GUILayout.Button("<", new GUILayoutOption[] { GUILayout.Width(25) }))
+                if (GUIUnstrip.Button("<", new GUILayoutOption[] { GUILayout.Width(25) }))
                 {
                     SetEnum(ref Value, -1);
                     SetValue();
                 }
-                if (GUILayout.Button(">", new GUILayoutOption[] { GUILayout.Width(25) }))
+                if (GUIUnstrip.Button(">", new GUILayoutOption[] { GUILayout.Width(25) }))
                 {
                     SetEnum(ref Value, 1);
                     SetValue();
                 }
             }
 
-            GUILayout.Label(Value.ToString() + "<color=yellow><i> (" + ValueType + ")</i></color>", null);
+            GUIUnstrip.Label(Value.ToString() + "<color=#2df7b2><i> (" + ValueType + ")</i></color>");
         }
 
         public void SetEnum(ref object value, int change)

src/CachedObjects/Struct/CachePrimitive.cs

@@ -55,7 +55,7 @@ namespace Explorer
 
                 if (CanWrite)
                 {
-                    b = GUILayout.Toggle(b, label, null);
+                    b = GUIUnstrip.Toggle(b, label);
                     if (b != (bool)Value)
                     {
                         SetValueFromInput(b.ToString());
@@ -63,36 +63,36 @@ namespace Explorer
                 }
                 else
                 {
-                    GUILayout.Label(label, null);
+                    GUIUnstrip.Label(label);
                 }
             }
             else
             {
                 // using ValueType.Name instead of ValueTypeName, because we only want the short name.
-                GUILayout.Label("<color=yellow><i>" + ValueType.Name + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
+                GUIUnstrip.Label("<color=#2df7b2><i>" + ValueType.Name + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
 
                 int dynSize = 25 + (m_valueToString.Length * 15);
-                var maxwidth = window.width - 300f;
+                var maxwidth = window.width - 310f;
                 if (CanWrite) maxwidth -= 60;
 
                 if (dynSize > maxwidth)
                 {
-                    m_valueToString = GUILayout.TextArea(m_valueToString, new GUILayoutOption[] { GUILayout.MaxWidth(maxwidth) });
+                    m_valueToString = GUIUnstrip.TextArea(m_valueToString, new GUILayoutOption[] { GUILayout.MaxWidth(maxwidth) });
                 }
                 else
                 {
-                    m_valueToString = GUILayout.TextField(m_valueToString, new GUILayoutOption[] { GUILayout.MaxWidth(dynSize) });
+                    m_valueToString = GUIUnstrip.TextField(m_valueToString, new GUILayoutOption[] { GUILayout.MaxWidth(dynSize) });
                 }
 
                 if (CanWrite)
                 {
-                    if (GUILayout.Button("<color=#00FF00>Apply</color>", new GUILayoutOption[] { GUILayout.Width(60) }))
+                    if (GUIUnstrip.Button("<color=#00FF00>Apply</color>", new GUILayoutOption[] { GUILayout.Width(60) }))
                     {
                         SetValueFromInput(m_valueToString);
                     }
                 }
 
-                GUILayout.Space(5);
+                GUIUnstrip.Space(10);
             }
         }
 

src/CachedObjects/Struct/CacheQuaternion.cs

@@ -7,12 +7,15 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheQuaternion : CacheObjectBase
+    public class CacheQuaternion : CacheObjectBase, IExpandHeight
     {
         private string x = "0";
         private string y = "0";
         private string z = "0";
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
         public override void UpdateValue()
         {
             base.UpdateValue();
@@ -26,41 +29,61 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Quaternion</color>: {((Quaternion)Value).eulerAngles.ToString()}", null);
-
             if (CanWrite)
             {
-                GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+                if (!IsExpanded)
+                {
+                    if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
-                x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+            string lbl = $"<color=#2df7b2>Quaternion</color>: {((Quaternion)Value).eulerAngles.ToString()}";
+            GUIUnstrip.Label(lbl);
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
-                y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+            if (CanWrite && IsExpanded)
+            {
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
-                z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                var whitespace = CalcWhitespace(window);
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
+                x = GUIUnstrip.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
+                y = GUIUnstrip.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
+                z = GUIUnstrip.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
 
                 // draw set value button
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                if (GUIUnstrip.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
                 {
                     SetValueFromInput();
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
             }
         }
 

src/CachedObjects/Struct/CacheRect.cs

@@ -7,13 +7,16 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheRect : CacheObjectBase
+    public class CacheRect : CacheObjectBase, IExpandHeight
     {
         private string x = "0";
         private string y = "0";
         private string w = "0";
         private string h = "0";
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
         public override void UpdateValue()
         {
             base.UpdateValue();
@@ -28,47 +31,66 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Rect</color>: {((Rect)Value).ToString()}", null);
-
             if (CanWrite)
             {
-                GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+                if (!IsExpanded)
+                {
+                    if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
-                x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+            GUIUnstrip.Label($"<color=#2df7b2>Rect</color>: {((Rect)Value).ToString()}");
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
-                y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+            if (CanWrite && IsExpanded)
+            {
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
-                w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                var whitespace = CalcWhitespace(window);
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("H:", new GUILayoutOption[] { GUILayout.Width(30) });
-                h = GUILayout.TextField(h, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
+                x = GUIUnstrip.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
+                y = GUIUnstrip.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
+                w = GUIUnstrip.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
+
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("H:", new GUILayoutOption[] { GUILayout.Width(30) });
+                h = GUIUnstrip.TextField(h, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
 
                 // draw set value button
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                if (GUIUnstrip.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
                 {
                     SetValueFromInput();
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
             }
         }
 

src/CachedObjects/Struct/CacheVector.cs

@@ -8,7 +8,7 @@ using UnityEngine;
 
 namespace Explorer
 {
-    public class CacheVector : CacheObjectBase
+    public class CacheVector : CacheObjectBase, IExpandHeight
     {
         public int VectorSize = 2;
 
@@ -19,6 +19,9 @@ namespace Explorer
 
         private MethodInfo m_toStringMethod;
 
+        public bool IsExpanded { get; set; }
+        public float WhiteSpace { get; set; } = 215f;
+
         public override void Init()
         {
             if (Value is Vector2)
@@ -63,55 +66,74 @@ namespace Explorer
 
         public override void DrawValue(Rect window, float width)
         {
-            GUILayout.Label($"<color=yellow>Vector{VectorSize}</color>: {(string)m_toStringMethod.Invoke(Value, new object[0])}", null);            
-
             if (CanWrite)
             {
-                GUILayout.EndHorizontal();
-                var whitespace = window.width - width - 90;
+                if (!IsExpanded)
+                {
+                    if (GUIUnstrip.Button("v", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = true;
+                    }
+                }
+                else
+                {
+                    if (GUIUnstrip.Button("^", new GUILayoutOption[] { GUILayout.Width(25) }))
+                    {
+                        IsExpanded = false;
+                    }
+                }
+            }
+
+            GUIUnstrip.Label($"<color=#2df7b2>Vector{VectorSize}</color>: {(string)m_toStringMethod.Invoke(Value, new object[0])}");            
+
+            if (CanWrite && IsExpanded)
+            {
+                GUIUnstrip.EndHorizontal();
+
+                var whitespace = CalcWhitespace(window);
 
                 // always draw x and y
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
-                x = GUILayout.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("X:", new GUILayoutOption[] { GUILayout.Width(30) });
+                x = GUIUnstrip.TextField(x, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                GUILayout.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
-                y = GUILayout.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
-                GUILayout.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                GUIUnstrip.Label("Y:", new GUILayoutOption[] { GUILayout.Width(30) });
+                y = GUIUnstrip.TextField(y, new GUILayoutOption[] { GUILayout.Width(120) });
+                GUIUnstrip.EndHorizontal();
 
                 if (VectorSize > 2)
                 {
                     // draw z
-                    GUILayout.BeginHorizontal(null);
-                    GUILayout.Space(whitespace);
-                    GUILayout.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
-                    z = GUILayout.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
-                    GUILayout.EndHorizontal();
+                    GUIUnstrip.BeginHorizontal();
+                    GUIUnstrip.Space(whitespace);
+                    GUIUnstrip.Label("Z:", new GUILayoutOption[] { GUILayout.Width(30) });
+                    z = GUIUnstrip.TextField(z, new GUILayoutOption[] { GUILayout.Width(120) });
+                    GUIUnstrip.EndHorizontal();
                 }
                 if (VectorSize > 3)
                 {
                     // draw w
-                    GUILayout.BeginHorizontal(null);
-                    GUILayout.Space(whitespace);
-                    GUILayout.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
-                    w = GUILayout.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
-                    GUILayout.EndHorizontal();
+                    GUIUnstrip.BeginHorizontal();
+                    GUIUnstrip.Space(whitespace);
+                    GUIUnstrip.Label("W:", new GUILayoutOption[] { GUILayout.Width(30) });
+                    w = GUIUnstrip.TextField(w, new GUILayoutOption[] { GUILayout.Width(120) });
+                    GUIUnstrip.EndHorizontal();
                 }
 
                 // draw set value button
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Space(whitespace);
-                if (GUILayout.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Space(whitespace);
+                if (GUIUnstrip.Button("<color=lime>Apply</color>", new GUILayoutOption[] { GUILayout.Width(155) }))
                 {
                     SetValueFromInput();
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
             }
         }
 

src/Config/ModConfig.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class ModConfig
+    {
+        [XmlIgnore] public static readonly XmlSerializer Serializer = new XmlSerializer(typeof(ModConfig));
+
+        [XmlIgnore] private const string EXPLORER_FOLDER = @"Mods\CppExplorer";
+        [XmlIgnore] private const string SETTINGS_PATH = EXPLORER_FOLDER + @"\config.xml";
+
+        [XmlIgnore] public static ModConfig Instance;
+
+        public KeyCode Main_Menu_Toggle = KeyCode.F7;
+        public Vector2 Default_Window_Size = new Vector2(550, 700);
+
+        public static void OnLoad()
+        {
+            if (!Directory.Exists(EXPLORER_FOLDER))
+            {
+                Directory.CreateDirectory(EXPLORER_FOLDER);
+            }
+
+            if (LoadSettings()) return;
+
+            Instance = new ModConfig();
+            SaveSettings();
+        }
+
+        // returns true if settings successfully loaded
+        public static bool LoadSettings(bool checkExist = true)
+        {
+            if (checkExist && !File.Exists(SETTINGS_PATH))
+                return false;
+
+            try
+            {
+                using (var file = File.OpenRead(SETTINGS_PATH))
+                {
+                    Instance = (ModConfig)Serializer.Deserialize(file);
+                }
+            }
+            catch 
+            {
+                return false;
+            }
+
+            return Instance != null;
+        }
+
+        public static void SaveSettings(bool checkExist = true)
+        {
+            if (checkExist && File.Exists(SETTINGS_PATH))
+                File.Delete(SETTINGS_PATH);
+
+            using (var file = File.Create(SETTINGS_PATH))
+            {
+                Serializer.Serialize(file, Instance);
+            }
+        }
+    }
+}

src/CppExplorer.cs

@@ -13,7 +13,7 @@ namespace Explorer
     public class CppExplorer : MelonMod
     {
         public const string NAME    = "CppExplorer";
-        public const string VERSION = "1.6.4";
+        public const string VERSION = "1.7.2";
         public const string AUTHOR  = "Sinai";
         public const string GUID    = "com.sinai.cppexplorer";
 
@@ -24,45 +24,26 @@ namespace Explorer
             get => m_showMenu;
             set => SetShowMenu(value);
         }
-        private static bool m_showMenu;
-
-        public static bool ForceUnlockMouse
-        {
-            get => m_forceUnlock;
-            set => SetForceUnlock(value);
-        }
-        private static bool m_forceUnlock;
-        private static CursorLockMode m_lastLockMode;
-        private static bool m_lastVisibleState;
-        private static bool m_currentlySettingCursor = false;
-
-        public static bool ShouldForceMouse => ShowMenu && ForceUnlockMouse;
+        public static bool m_showMenu;        
 
         private static void SetShowMenu(bool show)
         {
             m_showMenu = show;
-            UpdateCursorControl();
+            CursorControl.UpdateCursorControl();
         }
 
-        // ========== MonoBehaviour methods ==========
-
         public override void OnApplicationStart()
         {
             Instance = this;
 
-            InputHelper.CheckInput();
+            ModConfig.OnLoad();
+
+            InputHelper.Init();
 
             new MainMenu();
             new WindowManager();
 
-            // Get current cursor state and enable cursor
-            m_lastLockMode = Cursor.lockState;
-            m_lastVisibleState = Cursor.visible;
-
-            // Enable ShowMenu and ForceUnlockMouse 
-            // (set m_showMenu to not call UpdateCursorState twice)
-            m_showMenu = true;
-            SetForceUnlock(true);
+            CursorControl.Init();
 
             MelonLogger.Log($"CppExplorer {VERSION} initialized.");
         }
@@ -75,23 +56,18 @@ namespace Explorer
 
         public override void OnUpdate()
         {
-            // Check main toggle key input
-            if (InputHelper.GetKeyDown(KeyCode.F7))
+            if (InputHelper.GetKeyDown(ModConfig.Instance.Main_Menu_Toggle))
             {
                 ShowMenu = !ShowMenu;
             }
 
             if (ShowMenu)
             {
-                // Check Force-Unlock input
-                if (InputHelper.GetKeyDown(KeyCode.LeftAlt))
-                {
-                    ForceUnlockMouse = !ForceUnlockMouse;
-                }
+                CursorControl.Update();
+                InspectUnderMouse.Update();
 
                 MainMenu.Instance.Update();
                 WindowManager.Instance.Update();
-                InspectUnderMouse.Update();
             }
         }
 
@@ -99,101 +75,14 @@ namespace Explorer
         {
             if (!ShowMenu) return;
 
+            var origSkin = GUI.skin;
+            GUI.skin = UIStyles.WindowSkin;
+
             MainMenu.Instance.OnGUI();
             WindowManager.Instance.OnGUI();
             InspectUnderMouse.OnGUI();
-        }
 
-        // =========== Cursor control ===========
-
-        private static void SetForceUnlock(bool unlock)
-        {
-            m_forceUnlock = unlock;
-            UpdateCursorControl();
-        }
-
-        private static void UpdateCursorControl()
-        {
-            m_currentlySettingCursor = true;
-            if (ShouldForceMouse)
-            {
-                Cursor.lockState = CursorLockMode.None;
-                Cursor.visible = true;
-            }
-            else
-            {
-                Cursor.lockState = m_lastLockMode;
-                Cursor.visible = m_lastVisibleState;
-            }
-            m_currentlySettingCursor = false;
-        }
-
-        // Force mouse to stay unlocked and visible while UnlockMouse and ShowMenu are true.
-        // Also keep track of when anything else tries to set Cursor state, this will be the
-        // value that we set back to when we close the menu or disable force-unlock.
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.lockState), MethodType.Setter)]
-        public class Cursor_set_lockState
-        {
-            [HarmonyPrefix]
-            public static void Prefix(ref CursorLockMode value)
-            {
-                if (!m_currentlySettingCursor)
-                {
-                    m_lastLockMode = value;
-
-                    if (ShouldForceMouse)
-                    {
-                        value = CursorLockMode.None;
-                    }
-                }                
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.visible), MethodType.Setter)]
-        public class Cursor_set_visible
-        {
-            [HarmonyPrefix]
-            public static void Prefix(ref bool value)
-            {
-                if (!m_currentlySettingCursor)
-                {
-                    m_lastVisibleState = value;
-
-                    if (ShouldForceMouse)
-                    {
-                        value = true;
-                    }
-                }
-            }
-        }
-
-        // Make it appear as though UnlockMouse is disabled to the rest of the application.
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.lockState), MethodType.Getter)]
-        public class Cursor_get_lockState
-        {
-            [HarmonyPostfix]
-            public static void Postfix(ref CursorLockMode __result)
-            {
-                if (ShouldForceMouse)
-                {
-                    __result = m_lastLockMode;
-                }
-            }
-        }
-
-        [HarmonyPatch(typeof(Cursor), nameof(Cursor.visible), MethodType.Getter)]
-        public class Cursor_get_visible
-        {
-            [HarmonyPostfix]
-            public static void Postfix(ref bool __result)
-            {
-                if (ShouldForceMouse)
-                {
-                    __result = m_lastVisibleState;
-                }
-            }
+            GUI.skin = origSkin;
         }
     }
 }

src/CppExplorer.csproj

@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}</ProjectGuid>
     <OutputType>Library</OutputType>
@@ -24,10 +24,15 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <!-- Replace the '..\Steam\..` references with ones from your game (make sure to use the 'MelonLoader\' folder) -->
     <Reference Include="Il2Cppmscorlib">
       <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\Il2Cppmscorlib.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Il2CppSystem.Core">
+      <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\Il2CppSystem.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="mcs">
       <HintPath>..\lib\mcs.dll</HintPath>
       <Private>True</Private>
@@ -46,7 +51,6 @@
       <HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnhollowerBaseLib.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <!-- Replace these references with ones from your game (..\MelonLoader\ folder) -->
     <Reference Include="UnityEngine">
       <HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.dll</HintPath>
       <Private>False</Private>
@@ -73,7 +77,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Helpers\IExpandHeight.cs" />
+    <Compile Include="CachedObjects\IExpandHeight.cs" />
     <Compile Include="CachedObjects\Struct\CacheColor.cs" />
     <Compile Include="CachedObjects\Object\CacheDictionary.cs" />
     <Compile Include="CachedObjects\Struct\CacheEnum.cs" />
@@ -85,34 +89,38 @@
     <Compile Include="CachedObjects\Struct\CacheQuaternion.cs" />
     <Compile Include="CachedObjects\Struct\CacheVector.cs" />
     <Compile Include="CachedObjects\Struct\CacheRect.cs" />
+    <Compile Include="Config\ModConfig.cs" />
     <Compile Include="CppExplorer.cs" />
     <Compile Include="Extensions\ReflectionExtensions.cs" />
     <Compile Include="Helpers\InputHelper.cs" />
+    <Compile Include="Menu\CursorControl.cs" />
+    <Compile Include="Tests\TestClass.cs" />
     <Compile Include="UnstripFixes\GUIUnstrip.cs" />
+    <Compile Include="UnstripFixes\LayoutUtilityUnstrip.cs" />
     <Compile Include="UnstripFixes\ScrollViewStateUnstrip.cs" />
     <Compile Include="Extensions\UnityExtensions.cs" />
     <Compile Include="Helpers\PageHelper.cs" />
     <Compile Include="Helpers\ReflectionHelpers.cs" />
-    <Compile Include="Helpers\UIHelpers.cs" />
+    <Compile Include="Menu\UIHelpers.cs" />
     <Compile Include="Helpers\UnityHelpers.cs" />
-    <Compile Include="MainMenu\InspectUnderMouse.cs" />
+    <Compile Include="Menu\InspectUnderMouse.cs" />
     <Compile Include="CachedObjects\CacheObjectBase.cs" />
     <Compile Include="UnstripFixes\SliderHandlerUnstrip.cs" />
     <Compile Include="UnstripFixes\UnstripExtensions.cs" />
-    <Compile Include="Windows\ResizeDrag.cs" />
-    <Compile Include="Windows\TabViewWindow.cs" />
-    <Compile Include="Windows\UIWindow.cs" />
-    <Compile Include="MainMenu\Pages\ConsolePage.cs" />
-    <Compile Include="MainMenu\Pages\Console\REPL.cs" />
-    <Compile Include="MainMenu\Pages\Console\REPLHelper.cs" />
-    <Compile Include="MainMenu\Pages\WindowPage.cs" />
-    <Compile Include="Windows\WindowManager.cs" />
-    <Compile Include="MainMenu\MainMenu.cs" />
-    <Compile Include="Windows\GameObjectWindow.cs" />
-    <Compile Include="Windows\ReflectionWindow.cs" />
-    <Compile Include="MainMenu\Pages\ScenePage.cs" />
-    <Compile Include="MainMenu\Pages\SearchPage.cs" />
-    <Compile Include="Helpers\UIStyles.cs" />
+    <Compile Include="Menu\Windows\ResizeDrag.cs" />
+    <Compile Include="Menu\Windows\TabViewWindow.cs" />
+    <Compile Include="Menu\Windows\UIWindow.cs" />
+    <Compile Include="Menu\MainMenu\Pages\ConsolePage.cs" />
+    <Compile Include="Menu\MainMenu\Pages\Console\REPL.cs" />
+    <Compile Include="Menu\MainMenu\Pages\Console\REPLHelper.cs" />
+    <Compile Include="Menu\MainMenu\Pages\WindowPage.cs" />
+    <Compile Include="Menu\Windows\WindowManager.cs" />
+    <Compile Include="Menu\MainMenu\MainMenu.cs" />
+    <Compile Include="Menu\Windows\GameObjectWindow.cs" />
+    <Compile Include="Menu\Windows\ReflectionWindow.cs" />
+    <Compile Include="Menu\MainMenu\Pages\ScenePage.cs" />
+    <Compile Include="Menu\MainMenu\Pages\SearchPage.cs" />
+    <Compile Include="Menu\UIStyles.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/CppExplorer.sln

@@ -10,8 +10,8 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Helpers/InputHelper.cs

@@ -15,93 +15,90 @@ namespace Explorer
     /// </summary>
     public static class InputHelper
     {
-        public static void CheckInput()
-        {
-            if (Input == null)
-            {
-                MelonLogger.Log("UnityEngine.Input is null, trying to load manually....");
+        // If Input module failed to load at all
+        public static bool NO_INPUT;
 
-                if ((TryLoad("UnityEngine.InputLegacyModule.dll") || TryLoad("UnityEngine.CoreModule.dll")) && Input != null)
-                {
-                    MelonLogger.Log("Ok!");
-                }
-                else
-                {
-                    MelonLogger.Log("Could not load Input module!");
-                }
-
-                bool TryLoad(string module)
-                {
-                    var path = $@"MelonLoader\Managed\{module}";
-                    if (!File.Exists(path)) return false;
-
-                    try
-                    {
-                        Assembly.Load(File.ReadAllBytes(path));
-                        return true;
-                    }
-                    catch (Exception e)
-                    {
-                        MelonLogger.Log(e.GetType() + ", " + e.Message);
-                        return false;
-                    }
-                }
-            }
-        }
-
-        public static Type Input => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
+        // Base UnityEngine.Input class
+        private static Type Input => _input ?? (_input = ReflectionHelpers.GetTypeByName("UnityEngine.Input"));
         private static Type _input;
 
-        private static PropertyInfo MousePosInfo => _mousePosition ?? (_mousePosition = Input?.GetProperty("mousePosition"));
+        // Cached member infos
         private static PropertyInfo _mousePosition;
-
-        private static MethodInfo GetKeyInfo => _getKey ?? (_getKey = Input?.GetMethod("GetKey", new Type[] { typeof(KeyCode) }));
         private static MethodInfo _getKey;
-
-        private static MethodInfo GetKeyDownInfo => _getKeyDown ?? (_getKeyDown = Input?.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) }));
         private static MethodInfo _getKeyDown;
-
-        private static MethodInfo GetMouseButtonInfo => _getMouseButton ?? (_getMouseButton = Input?.GetMethod("GetMouseButton", new Type[] { typeof(int) }));
         private static MethodInfo _getMouseButton;
-
-        private static MethodInfo GetMouseButtonDownInfo => _getMouseButtonDown ?? (_getMouseButtonDown = Input?.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) }));
         private static MethodInfo _getMouseButtonDown;
 
+        public static void Init()
+        {
+            if (Input == null && !TryManuallyLoadInput())
+            {
+                NO_INPUT = true;
+                return;
+            }
+
+            // Cache reflection now that we know Input is loaded
+
+            _mousePosition = Input.GetProperty("mousePosition");
+
+            _getKey = Input.GetMethod("GetKey", new Type[] { typeof(KeyCode) });
+            _getKeyDown = Input.GetMethod("GetKeyDown", new Type[] { typeof(KeyCode) });
+            _getMouseButton = Input.GetMethod("GetMouseButton", new Type[] { typeof(int) });
+            _getMouseButtonDown = Input.GetMethod("GetMouseButtonDown", new Type[] { typeof(int) });
+        }
+
 #pragma warning disable IDE1006 // Camel-case property (Unity style)
         public static Vector3 mousePosition
         {
             get
             {
-                if (Input == null) return Vector3.zero;
-                return (Vector3)MousePosInfo.GetValue(null);
+                if (NO_INPUT) return Vector3.zero;
+                return (Vector3)_mousePosition.GetValue(null);
             }
         }
 #pragma warning restore IDE1006
 
         public static bool GetKeyDown(KeyCode key)
         {
-            if (Input == null) return false;
-            return (bool)GetKeyDownInfo.Invoke(null, new object[] { key });
+            if (NO_INPUT) return false;
+            return (bool)_getKeyDown.Invoke(null, new object[] { key });
         }
 
         public static bool GetKey(KeyCode key)
         {
-            if (Input == null) return false;
-            return (bool)GetKeyInfo.Invoke(null, new object[] { key });
+            if (NO_INPUT) return false;
+            return (bool)_getKey.Invoke(null, new object[] { key });
         }
 
         /// <param name="btn">1 = left, 2 = middle, 3 = right, etc</param>
         public static bool GetMouseButtonDown(int btn)
         {
-            if (Input == null) return false;
-            return (bool)GetMouseButtonDownInfo.Invoke(null, new object[] { btn });
+            if (NO_INPUT) return false;
+            return (bool)_getMouseButtonDown.Invoke(null, new object[] { btn });
         }
 
         /// <param name="btn">1 = left, 2 = middle, 3 = right, etc</param>
         public static bool GetMouseButton(int btn)
         {
-            if (Input == null) return false;
-            return (bool)GetMouseButtonInfo.Invoke(null, new object[] { btn });
+            if (NO_INPUT) return false;
+            return (bool)_getMouseButton.Invoke(null, new object[] { btn });
+        }
+
+        private static bool TryManuallyLoadInput()
+        {
+            MelonLogger.Log("UnityEngine.Input is null, trying to load manually....");
+
+            if ((ReflectionHelpers.LoadModule("UnityEngine.InputLegacyModule.dll") || ReflectionHelpers.LoadModule("UnityEngine.CoreModule.dll")) 
+                && Input != null)
+            {
+                MelonLogger.Log("Ok!");
+                return true;
+            }
+            else
+            {
+                MelonLogger.Log("Could not load Input module!");
+                return false;
+            }
         }
     }
 }

src/Helpers/PageHelper.cs

@@ -51,7 +51,7 @@ namespace Explorer
             var orig = GUI.skin.label.alignment;
             GUI.skin.label.alignment = TextAnchor.MiddleCenter;
 
-            GUILayout.Label($"Page {PageOffset + 1}/{MaxPageOffset + 1}", new GUILayoutOption[] { GUILayout.Width(80) });
+            GUIUnstrip.Label($"Page {PageOffset + 1}/{MaxPageOffset + 1}", new GUILayoutOption[] { GUILayout.Width(80) });
 
             GUI.skin.label.alignment = orig;
         }
@@ -97,9 +97,9 @@ namespace Explorer
 
         public void DrawLimitInputArea()
         {
-            GUILayout.Label("Limit: ", new GUILayoutOption[] { GUILayout.Width(50) });
+            GUIUnstrip.Label("Limit: ", new GUILayoutOption[] { GUILayout.Width(50) });
             var limit = this.ItemsPerPage.ToString();
-            limit = GUILayout.TextField(limit, new GUILayoutOption[] { GUILayout.Width(50) });
+            limit = GUIUnstrip.TextField(limit, new GUILayoutOption[] { GUILayout.Width(50) });
             if (limit != ItemsPerPage.ToString() && int.TryParse(limit, out int i))
             {
                 ItemsPerPage = i;

src/Helpers/ReflectionHelpers.cs

@@ -3,6 +3,8 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.IO;
+using MelonLoader;
 using UnhollowerBaseLib;
 using UnhollowerRuntimeLib;
 using UnityEngine;
@@ -34,16 +36,20 @@ namespace Explorer
 
         public static bool IsEnumerable(Type t)
         {
+            // Not needed for Il2Cpp at the moment. Don't want these to behave as Enumerables.
+            //if (typeof(Transform).IsAssignableFrom(t)) return false;
+
             return typeof(IEnumerable).IsAssignableFrom(t);
         }
 
-        // Only Il2Cpp List needs this check. C# List is IEnumerable.
-        public static bool IsCppList(Type t)
+        // Checks for Il2Cpp List or HashSet.
+        public static bool IsCppEnumerable(Type t)
         {
             if (t.IsGenericType && t.GetGenericTypeDefinition() is Type g)
             {
                 return typeof(Il2CppSystem.Collections.Generic.List<>).IsAssignableFrom(g)
-                    || typeof(Il2CppSystem.Collections.Generic.IList<>).IsAssignableFrom(g);
+                    || typeof(Il2CppSystem.Collections.Generic.IList<>).IsAssignableFrom(g)
+                    || typeof(Il2CppSystem.Collections.Generic.HashSet<>).IsAssignableFrom(g);
             }
             else
             {
@@ -89,18 +95,19 @@ namespace Explorer
         {
             if (obj == null) return null;
 
+            // Need to use GetIl2CppType for Il2CppSystem Objects
             if (obj is Il2CppSystem.Object ilObject)
             {
-                var ilTypeName = ilObject.GetIl2CppType().AssemblyQualifiedName;
-
-                if (Type.GetType(ilTypeName) is Type t && !t.FullName.Contains("System.RuntimeType"))
+                // Prevent weird behaviour when inspecting an Il2CppSystem.Type object.
+                if (ilObject is ILType)
                 {
-                    return t;
+                    return typeof(ILType);
                 }
 
-                return ilObject.GetType();
+                return Type.GetType(ilObject.GetIl2CppType().AssemblyQualifiedName) ?? obj.GetType();
             }
 
+            // It's a normal object, this is fine
             return obj.GetType();
         }
 
@@ -109,17 +116,33 @@ namespace Explorer
             var list = new List<Type>();
 
             var type = GetActualType(obj);
-            list.Add(type);
 
-            while (type.BaseType != null)
+            while (type != null)
             {
-                type = type.BaseType;
                 list.Add(type);
+                type = type.BaseType;
             }
 
             return list.ToArray();
         }
 
+        public static bool LoadModule(string module)
+        {
+            var path = $@"MelonLoader\Managed\{module}";
+            if (!File.Exists(path)) return false;
+
+            try
+            {
+                Assembly.Load(File.ReadAllBytes(path));
+                return true;
+            }
+            catch (Exception e)
+            {
+                MelonLogger.Log(e.GetType() + ", " + e.Message);
+                return false;
+            }
+        }
+
         public static string ExceptionToString(Exception e)
         {
             if (IsFailedGeneric(e))

src/Menu/CursorControl.cs

@@ -0,0 +1,183 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+using Harmony;
+using MelonLoader;
+using System.Reflection;
+
+namespace Explorer
+{
+    public class CursorControl
+    {
+        public static bool ForceUnlockMouse
+        {
+            get => m_forceUnlock;
+            set => SetForceUnlock(value);
+        }
+        private static bool m_forceUnlock;
+        private static CursorLockMode m_lastLockMode;
+        private static bool m_lastVisibleState;
+        private static bool m_currentlySettingCursor = false;
+
+        public static bool ShouldForceMouse => CppExplorer.ShowMenu && ForceUnlockMouse;
+
+        private static Type CursorType => m_cursorType ?? (m_cursorType = ReflectionHelpers.GetTypeByName("UnityEngine.Cursor"));
+        private static Type m_cursorType;
+
+        public static void Init()
+        {
+            try
+            {
+                // Check if Cursor class is loaded
+                if (CursorType == null)
+                {
+                    MelonLogger.Log("Trying to manually load Cursor module...");
+
+                    if (ReflectionHelpers.LoadModule("UnityEngine.CoreModule") && CursorType != null)
+                    {
+                        MelonLogger.Log("Ok!");
+                    }
+                    else
+                    {
+                        throw new Exception("Could not load UnityEngine.Cursor module!");
+                    }
+                }
+
+                // Get current cursor state and enable cursor
+                m_lastLockMode = Cursor.lockState;
+                m_lastVisibleState = Cursor.visible;
+
+                // Setup Harmony Patches
+                TryPatch("lockState", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Prefix_set_lockState))), true);
+                TryPatch("lockState", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Postfix_get_lockState))), false);
+
+                TryPatch("visible", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Prefix_set_visible))), true);
+                TryPatch("visible", new HarmonyMethod(typeof(CursorControl).GetMethod(nameof(Postfix_get_visible))), false);
+            }
+            catch (Exception e)
+            {
+                MelonLogger.Log($"Exception on CursorControl.Init! {e.GetType()}, {e.Message}");
+            }
+
+            // Enable ShowMenu and ForceUnlockMouse 
+            // (set m_showMenu directly to not call UpdateCursorState twice)
+            CppExplorer.m_showMenu = true;
+            ForceUnlockMouse = true;
+        }
+
+        private static void TryPatch(string property, HarmonyMethod patch, bool setter)
+        {
+            try
+            {
+                var harmony = CppExplorer.Instance.harmonyInstance;
+                var prop = typeof(Cursor).GetProperty(property);
+
+                if (setter)
+                {
+                    // setter is prefix
+                    harmony.Patch(prop.GetSetMethod(), patch);
+                }
+                else
+                {
+                    // getter is postfix
+                    harmony.Patch(prop.GetGetMethod(), null, patch);
+                }
+            }
+            catch (Exception e)
+            {
+                MelonLogger.Log($"[NON-FATAL] Couldn't patch a method: {e.Message}");
+            }
+        }
+
+        private static void SetForceUnlock(bool unlock)
+        {
+            m_forceUnlock = unlock;
+            UpdateCursorControl();
+        }
+
+        public static void Update()
+        {
+            // Check Force-Unlock input
+            if (InputHelper.GetKeyDown(KeyCode.LeftAlt))
+            {
+                ForceUnlockMouse = !ForceUnlockMouse;
+            }
+        }
+
+        public static void UpdateCursorControl()
+        {
+            try
+            {
+                m_currentlySettingCursor = true;
+                if (ShouldForceMouse)
+                {
+                    Cursor.lockState = CursorLockMode.None;
+                    Cursor.visible = true;
+                }
+                else
+                {
+                    Cursor.lockState = m_lastLockMode;
+                    Cursor.visible = m_lastVisibleState;
+                }
+                m_currentlySettingCursor = false;
+            }
+            catch (Exception e)
+            {
+                MelonLogger.Log($"Exception setting Cursor state: {e.GetType()}, {e.Message}");
+            }
+        }
+
+        // Force mouse to stay unlocked and visible while UnlockMouse and ShowMenu are true.
+        // Also keep track of when anything else tries to set Cursor state, this will be the
+        // value that we set back to when we close the menu or disable force-unlock.
+
+        [HarmonyPrefix]
+        public static void Prefix_set_lockState(ref CursorLockMode value)
+        {
+            if (!m_currentlySettingCursor)
+            {
+                m_lastLockMode = value;
+
+                if (ShouldForceMouse)
+                {
+                    value = CursorLockMode.None;
+                }
+            }
+        }
+
+        [HarmonyPrefix]
+        public static void Prefix_set_visible(ref bool value)
+        {
+            if (!m_currentlySettingCursor)
+            {
+                m_lastVisibleState = value;
+
+                if (ShouldForceMouse)
+                {
+                    value = true;
+                }
+            }
+        }
+
+        [HarmonyPrefix]
+        public static void Postfix_get_lockState(ref CursorLockMode __result)
+        {
+            if (ShouldForceMouse)
+            {
+                __result = m_lastLockMode;
+            }
+        }
+
+        [HarmonyPrefix]
+        public static void Postfix_get_visible(ref bool __result)
+        {
+            if (ShouldForceMouse)
+            {
+                __result = m_lastVisibleState;
+            }
+        }
+    }
+}

src/Menu/MainMenu/MainMenu.cs

@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityEngine.EventSystems;
 using MelonLoader;
 
 namespace Explorer
@@ -21,15 +19,17 @@ namespace Explorer
             Pages.Add(new SearchPage());
             Pages.Add(new ConsolePage());
 
-            foreach (var page in Pages)
+            for (int i = 0; i < Pages.Count; i++)
             {
+                var page = Pages[i];
                 page.Init();
             }
         }
 
-        public const int MainWindowID = 10;
-        public static Rect MainRect = new Rect(5, 5, 550, 700);
-        private static readonly List<WindowPage> Pages = new List<WindowPage>();
+        public const int MainWindowID = 5000;
+        public static Rect MainRect = new Rect(5,5, ModConfig.Instance.Default_Window_Size.x,ModConfig.Instance.Default_Window_Size.y);
+
+        public static readonly List<WindowPage> Pages = new List<WindowPage>();
         private static int m_currentPage = 0;
 
         public static void SetCurrentPage(int index)
@@ -51,25 +51,20 @@ namespace Explorer
 
         public void OnGUI()
         {
-            var origSkin = GUI.skin;
-            GUI.skin = UIStyles.WindowSkin;
-
             MainRect = GUI.Window(MainWindowID, MainRect, (GUI.WindowFunction)MainWindow, CppExplorer.NAME);
-
-            GUI.skin = origSkin;
         }
 
         private void MainWindow(int id)
         {
             GUI.DragWindow(new Rect(0, 0, MainRect.width - 90, 20));
 
-            if (GUI.Button(new Rect(MainRect.width - 90, 2, 80, 20), "Hide (F7)"))
+            if (GUI.Button(new Rect(MainRect.width - 90, 2, 80, 20), $"Hide ({ModConfig.Instance.Main_Menu_Toggle})"))
             {
                 CppExplorer.ShowMenu = false;
                 return;
             }
 
-            GUILayout.BeginArea(new Rect(5, 25, MainRect.width - 10, MainRect.height - 35), GUI.skin.box);
+            GUIUnstrip.BeginArea(new Rect(5, 25, MainRect.width - 10, MainRect.height - 35), GUI.skin.box);
 
             MainHeader();
 
@@ -83,12 +78,12 @@ namespace Explorer
 
             MainRect = ResizeDrag.ResizeWindow(MainRect, MainWindowID);
 
-            GUILayout.EndArea();
+            GUIUnstrip.EndArea();
         }
 
         private void MainHeader()
         {
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             for (int i = 0; i < Pages.Count; i++)
             {
                 if (m_currentPage == i)
@@ -96,25 +91,27 @@ namespace Explorer
                 else
                     GUI.color = Color.white;
 
-                if (GUILayout.Button(Pages[i].Name, null))
+                if (GUIUnstrip.Button(Pages[i].Name))
                 {
                     m_currentPage = i;
                 }
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             GUI.color = Color.white;
-            InspectUnderMouse.EnableInspect = GUILayout.Toggle(InspectUnderMouse.EnableInspect, "Inspect Under Mouse (Shift + RMB)", null);
+            InspectUnderMouse.EnableInspect = GUIUnstrip.Toggle(InspectUnderMouse.EnableInspect, "Inspect Under Mouse (Shift + RMB)");
 
-            bool mouseState = CppExplorer.ForceUnlockMouse;
-            bool setMouse = GUILayout.Toggle(mouseState, "Force Unlock Mouse (Left Alt)", null);
-            if (setMouse != mouseState) CppExplorer.ForceUnlockMouse = setMouse;
+            bool mouseState = CursorControl.ForceUnlockMouse;
+            bool setMouse = GUIUnstrip.Toggle(mouseState, "Force Unlock Mouse (Left Alt)");
+            if (setMouse != mouseState) CursorControl.ForceUnlockMouse = setMouse;
 
-            WindowManager.TabView = GUILayout.Toggle(WindowManager.TabView, "Tab View", null);
-            GUILayout.EndHorizontal();
+            WindowManager.TabView = GUIUnstrip.Toggle(WindowManager.TabView, "Tab View");
+            GUIUnstrip.EndHorizontal();
+
+            //GUIUnstrip.Space(10);
+            GUIUnstrip.Space(10);
 
-            GUILayout.Space(10);
             GUI.color = Color.white;
         }
     }

src/Menu/MainMenu/Pages/ConsolePage.cs

@@ -58,7 +58,9 @@ MelonLogger.Log(""hello world"");";
             }
             catch (Exception e)
             {
-                MelonLogger.Log($"Error setting up console!\r\nMessage: {e.Message}\r\nStack: {e.StackTrace}");
+                MelonLogger.Log($"Error setting up console!\r\nMessage: {e.Message}");
+                MainMenu.SetCurrentPage(0);
+                MainMenu.Pages.Remove(this);
             }
         }
 
@@ -121,19 +123,19 @@ MelonLogger.Log(""hello world"");";
 
         public override void DrawWindow()
         {
-            GUILayout.Label("<b><size=15><color=cyan>C# REPL Console</color></size></b>", null);
+            GUIUnstrip.Label("<b><size=15><color=cyan>C# REPL Console</color></size></b>");
 
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
-            GUILayout.Label("Enter code here as though it is a method body:", null);
+            GUIUnstrip.Label("Enter code here as though it is a method body:");
 
             inputAreaScroll = GUIUnstrip.BeginScrollView(inputAreaScroll, new GUILayoutOption[] { GUILayout.Height(250) });
 
-            MethodInput = GUILayout.TextArea(MethodInput, new GUILayoutOption[] { GUILayout.ExpandHeight(true) });
+            MethodInput = GUIUnstrip.TextArea(MethodInput, new GUILayoutOption[] { GUILayout.ExpandHeight(true) });
 
             GUIUnstrip.EndScrollView();
 
-            if (GUILayout.Button("<color=cyan><b>Execute</b></color>", null))
+            if (GUIUnstrip.Button("<color=cyan><b>Execute</b></color>"))
             {
                 try
                 {
@@ -155,24 +157,24 @@ MelonLogger.Log(""hello world"");";
                 }
             }
 
-            GUILayout.Label("<b>Using directives:</b>", null);
+            GUIUnstrip.Label("<b>Using directives:</b>");
 
-            GUILayout.BeginHorizontal(null);
-            GUILayout.Label("Add namespace:", new GUILayoutOption[] { GUILayout.Width(105) });
-            UsingInput = GUILayout.TextField(UsingInput, new GUILayoutOption[] { GUILayout.Width(150) });
-            if (GUILayout.Button("<b><color=lime>Add</color></b>", new GUILayoutOption[] { GUILayout.Width(120) }))
+            GUIUnstrip.BeginHorizontal();
+            GUIUnstrip.Label("Add namespace:", new GUILayoutOption[] { GUILayout.Width(105) });
+            UsingInput = GUIUnstrip.TextField(UsingInput, new GUILayoutOption[] { GUILayout.Width(150) });
+            if (GUIUnstrip.Button("<b><color=lime>Add</color></b>", new GUILayoutOption[] { GUILayout.Width(120) }))
             {
                 AddUsing(UsingInput);
             }
-            if (GUILayout.Button("<b><color=red>Clear All</color></b>", new GUILayoutOption[] { GUILayout.Width(120) }))
+            if (GUIUnstrip.Button("<b><color=red>Clear All</color></b>", new GUILayoutOption[] { GUILayout.Width(120) }))
             {
                 ResetConsole();
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
             foreach (var asm in UsingDirectives)
             {
-                GUILayout.Label(AsmToUsing(asm, true), null);
+                GUIUnstrip.Label(AsmToUsing(asm, true));
             }            
         }
 

src/Menu/MainMenu/Pages/ScenePage.cs

@@ -200,7 +200,7 @@ namespace Explorer
             {
                 DrawHeaderArea();
 
-                GUILayout.BeginVertical(GUI.skin.box, null);
+                GUIUnstrip.BeginVertical(GUI.skin.box, null);
 
                 DrawPageButtons();
 
@@ -213,7 +213,7 @@ namespace Explorer
                     DrawSearchResultsList();
                 }
 
-                GUILayout.EndVertical();
+                GUIUnstrip.EndVertical();
             }
             catch
             {
@@ -223,28 +223,28 @@ namespace Explorer
 
         private void DrawHeaderArea()
         {
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
 
             // Current Scene label
-            GUILayout.Label("Current Scene:", new GUILayoutOption[] { GUILayout.Width(120) });
+            GUIUnstrip.Label("Current Scene:", new GUILayoutOption[] { GUILayout.Width(120) });
             SceneChangeButtons();
-            GUILayout.Label("<color=cyan>" + m_currentScene + "</color>", null); //new GUILayoutOption[] { GUILayout.Width(250) });
+            GUIUnstrip.Label("<color=cyan>" + m_currentScene + "</color>");
 
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
             // ----- GameObject Search -----
-            GUILayout.BeginHorizontal(GUI.skin.box, null);
-            GUILayout.Label("<b>Search Scene:</b>", new GUILayoutOption[] { GUILayout.Width(100) });
+            GUIUnstrip.BeginHorizontal(GUI.skin.box, null);
+            GUIUnstrip.Label("<b>Search Scene:</b>", new GUILayoutOption[] { GUILayout.Width(100) });
 
-            m_searchInput = GUILayout.TextField(m_searchInput, null);
+            m_searchInput = GUIUnstrip.TextField(m_searchInput);
 
-            if (GUILayout.Button("Search", new GUILayoutOption[] { GUILayout.Width(80) }))
+            if (GUIUnstrip.Button("Search", new GUILayoutOption[] { GUILayout.Width(80) }))
             {
                 Search();
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
-            GUILayout.Space(5);
+            GUIUnstrip.Space(5);
         }
 
         private void SceneChangeButtons()
@@ -255,11 +255,11 @@ namespace Explorer
             if (scenes.Count > 1)
             {
                 int changeWanted = 0;
-                if (GUILayout.Button("<", new GUILayoutOption[] { GUILayout.Width(30) }))
+                if (GUIUnstrip.Button("<", new GUILayoutOption[] { GUILayout.Width(30) }))
                 {
                     changeWanted = -1;
                 }
-                if (GUILayout.Button(">", new GUILayoutOption[] { GUILayout.Width(30) }))
+                if (GUIUnstrip.Button(">", new GUILayoutOption[] { GUILayout.Width(30) }))
                 {
                     changeWanted = 1;
                 }
@@ -282,13 +282,13 @@ namespace Explorer
 
         private void DrawPageButtons()
         {
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
 
             Pages.DrawLimitInputArea();
 
             if (Pages.ItemCount > Pages.ItemsPerPage)
             {
-                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
                 {
                     Pages.TurnPage(Turn.Left, ref this.scroll);
 
@@ -297,7 +297,7 @@ namespace Explorer
 
                 Pages.CurrentPageLabel();
 
-                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
                 {
                     Pages.TurnPage(Turn.Right, ref this.scroll);
 
@@ -305,7 +305,7 @@ namespace Explorer
                 }
             }
 
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
         }
 
@@ -313,28 +313,28 @@ namespace Explorer
         {
             if (m_currentTransform != null)
             {
-                GUILayout.BeginHorizontal(null);
-                if (GUILayout.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
+                GUIUnstrip.BeginHorizontal();
+                if (GUIUnstrip.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
                 {
                     TraverseUp();
                 }
                 else
                 {
-                    GUILayout.Label("<color=cyan>" + m_currentTransform.GetGameObjectPath() + "</color>",
+                    GUIUnstrip.Label("<color=cyan>" + m_currentTransform.GetGameObjectPath() + "</color>",
                         new GUILayoutOption[] { GUILayout.Width(MainMenu.MainRect.width - 187f) });
                 }
 
                 UIHelpers.SmallInspectButton(m_currentTransform);
                 
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
             }
             else
             {
-                GUILayout.Label("Scene Root GameObjects:", null);
+                GUIUnstrip.Label("Scene Root GameObjects:");
 
                 if (m_getRootObjectsFailed)
                 {
-                    if (GUILayout.Button("Update Root Object List (auto-update failed!)", null))
+                    if (GUIUnstrip.Button("Update Root Object List (auto-update failed!)"))
                     {
                         Update_Impl(true);
                     }
@@ -359,7 +359,7 @@ namespace Explorer
                         }
 
                         label += "</i></color>";
-                        GUILayout.Label(label, null);
+                        GUIUnstrip.Label(label);
                     }
                     else
                     {
@@ -377,12 +377,12 @@ namespace Explorer
 
         private void DrawSearchResultsList()
         {
-            if (GUILayout.Button("<- Cancel Search", new GUILayoutOption[] { GUILayout.Width(150) }))
+            if (GUIUnstrip.Button("<- Cancel Search", new GUILayoutOption[] { GUILayout.Width(150) }))
             {
                 CancelSearch();
             }
 
-            GUILayout.Label("Search Results:", null);
+            GUIUnstrip.Label("Search Results:");
 
             if (m_searchResults.Count > 0)
             {
@@ -404,13 +404,13 @@ namespace Explorer
                     }
                     else
                     {
-                        GUILayout.Label("<i><color=red>Null or destroyed!</color></i>", null);
+                        GUIUnstrip.Label("<i><color=red>Null or destroyed!</color></i>");
                     }
                 }
             }
             else
             {
-                GUILayout.Label("<color=red><i>No results found!</i></color>", null);
+                GUIUnstrip.Label("<color=red><i>No results found!</i></color>");
             }
         }
 

src/Menu/MainMenu/Pages/SearchPage.cs

@@ -84,28 +84,28 @@ namespace Explorer
             try
             {
                 // helpers
-                GUILayout.BeginHorizontal(GUI.skin.box, null);
-                GUILayout.Label("<b><color=orange>Helpers</color></b>", new GUILayoutOption[] { GUILayout.Width(70) });
-                if (GUILayout.Button("Find Static Instances", new GUILayoutOption[] { GUILayout.Width(180) }))
+                GUIUnstrip.BeginHorizontal(GUI.skin.box, null);
+                GUIUnstrip.Label("<b><color=orange>Helpers</color></b>", new GUILayoutOption[] { GUILayout.Width(70) });
+                if (GUIUnstrip.Button("Find Static Instances", new GUILayoutOption[] { GUILayout.Width(180) }))
                 {
                     //m_searchResults = GetInstanceClassScanner().ToList();
                     CacheResults(GetInstanceClassScanner());                    
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
                 // search box
                 SearchBox();
 
                 // results
-                GUILayout.BeginVertical(GUI.skin.box, null);
+                GUIUnstrip.BeginVertical(GUI.skin.box, null);
 
                 GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                GUILayout.Label("<b><color=orange>Results </color></b>" + " (" + m_searchResults.Count + ")", null);
+                GUIUnstrip.Label("<b><color=orange>Results </color></b>" + " (" + m_searchResults.Count + ")");
                 GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
                 int count = m_searchResults.Count;
 
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
 
                 Pages.DrawLimitInputArea();
 
@@ -115,21 +115,21 @@ namespace Explorer
 
                     if (Pages.ItemCount > Pages.ItemsPerPage)
                     {
-                        if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                        if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
                         {
                             Pages.TurnPage(Turn.Left, ref this.resultsScroll);
                         }
 
                         Pages.CurrentPageLabel();
 
-                        if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                        if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
                         {
                             Pages.TurnPage(Turn.Right, ref this.resultsScroll);
                         }
                     }
                 }
 
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
                 resultsScroll = GUIUnstrip.BeginScrollView(resultsScroll);
 
@@ -146,11 +146,11 @@ namespace Explorer
                 }
                 else
                 {
-                    GUILayout.Label("<color=red><i>No results found!</i></color>", null);
+                    GUIUnstrip.Label("<color=red><i>No results found!</i></color>");
                 }
 
                 GUIUnstrip.EndScrollView();
-                GUILayout.EndVertical();
+                GUIUnstrip.EndVertical();
             }
             catch
             {
@@ -160,52 +160,52 @@ namespace Explorer
 
         private void SearchBox()
         {
-            GUILayout.BeginVertical(GUI.skin.box, null);
+            GUIUnstrip.BeginVertical(GUI.skin.box, null);
 
             // ----- GameObject Search -----
             GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-            GUILayout.Label("<b><color=orange>Search</color></b>", null);
+            GUIUnstrip.Label("<b><color=orange>Search</color></b>");
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
 
-            GUILayout.Label("Name Contains:", new GUILayoutOption[] { GUILayout.Width(100) });
-            m_searchInput = GUILayout.TextField(m_searchInput, new GUILayoutOption[] { GUILayout.Width(200) });
+            GUIUnstrip.Label("Name Contains:", new GUILayoutOption[] { GUILayout.Width(100) });
+            m_searchInput = GUIUnstrip.TextField(m_searchInput, new GUILayoutOption[] { GUILayout.Width(200) });
 
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
 
-            GUILayout.Label("Class Filter:", new GUILayoutOption[] { GUILayout.Width(100) });
+            GUIUnstrip.Label("Class Filter:", new GUILayoutOption[] { GUILayout.Width(100) });
             ClassFilterToggle(TypeFilter.Object, "Object");
             ClassFilterToggle(TypeFilter.GameObject, "GameObject");
             ClassFilterToggle(TypeFilter.Component, "Component");
             ClassFilterToggle(TypeFilter.Custom, "Custom");
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
             if (TypeMode == TypeFilter.Custom)
             {
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
                 GUI.skin.label.alignment = TextAnchor.MiddleRight;
-                GUILayout.Label("Custom Class:", new GUILayoutOption[] {  GUILayout.Width(250) });
+                GUIUnstrip.Label("Custom Class:", new GUILayoutOption[] {  GUILayout.Width(250) });
                 GUI.skin.label.alignment = TextAnchor.UpperLeft;
-                m_typeInput = GUILayout.TextField(m_typeInput, new GUILayoutOption[] {  GUILayout.Width(250) });
-                GUILayout.EndHorizontal();
+                m_typeInput = GUIUnstrip.TextField(m_typeInput, new GUILayoutOption[] {  GUILayout.Width(250) });
+                GUIUnstrip.EndHorizontal();
             }
 
-            GUILayout.BeginHorizontal(null);
-            GUILayout.Label("Scene Filter:", new GUILayoutOption[] {  GUILayout.Width(100) });
+            GUIUnstrip.BeginHorizontal();
+            GUIUnstrip.Label("Scene Filter:", new GUILayoutOption[] {  GUILayout.Width(100) });
             SceneFilterToggle(SceneFilter.Any, "Any", 60);
             SceneFilterToggle(SceneFilter.This, "This Scene", 100);
             SceneFilterToggle(SceneFilter.DontDestroy, "DontDestroyOnLoad", 140);
             SceneFilterToggle(SceneFilter.None, "No Scene", 80);
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
-            if (GUILayout.Button("<b><color=cyan>Search</color></b>", null))
+            if (GUIUnstrip.Button("<b><color=cyan>Search</color></b>"))
             {
                 Search();
             }
 
-            GUILayout.EndVertical();
+            GUIUnstrip.EndVertical();
         }
 
         private void ClassFilterToggle(TypeFilter mode, string label)
@@ -218,7 +218,7 @@ namespace Explorer
             {
                 GUI.color = Color.white;
             }
-            if (GUILayout.Button(label, new GUILayoutOption[] { GUILayout.Width(100) }))
+            if (GUIUnstrip.Button(label, new GUILayoutOption[] { GUILayout.Width(100) }))
             {
                 TypeMode = mode;
             }
@@ -235,7 +235,7 @@ namespace Explorer
             {
                 GUI.color = Color.white;
             }
-            if (GUILayout.Button(label, new GUILayoutOption[] { GUILayout.Width(width) }))
+            if (GUIUnstrip.Button(label, new GUILayoutOption[] { GUILayout.Width(width) }))
             {
                 SceneMode = mode;
             }
@@ -428,7 +428,7 @@ namespace Explorer
                 {
                     var t = ReflectionHelpers.GetActualType(obj);
 
-                    if (!FilterName(t.FullName) || ReflectionHelpers.IsEnumerable(t) || ReflectionHelpers.IsCppList(t))
+                    if (!FilterName(t.FullName) || ReflectionHelpers.IsEnumerable(t) || ReflectionHelpers.IsCppEnumerable(t))
                     {
                         continue;
                     }

src/Menu/UIHelpers.cs

@@ -15,7 +15,7 @@ namespace Explorer
         // helper for "Instantiate" button on UnityEngine.Objects
         public static void InstantiateButton(Object obj, float width = 100)
         {
-            if (GUILayout.Button("Instantiate", new GUILayoutOption[] { GUILayout.Width(width) }))
+            if (GUIUnstrip.Button("Instantiate", new GUILayoutOption[] { GUILayout.Width(width) }))
             {
                 var newobj = Object.Instantiate(obj);
 
@@ -62,18 +62,18 @@ namespace Explorer
 
             if (!obj)
             {
-                GUILayout.Label("<i><color=red>null</color></i>", null);
+                GUIUnstrip.Label("<i><color=red>null</color></i>");
                 return;
             }
 
             // ------ toggle active button ------
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             GUI.skin.button.alignment = TextAnchor.UpperLeft;
 
             GUI.color = activeColor;
 
-            enabled = GUILayout.Toggle(enabled, "", new GUILayoutOption[] { GUILayout.Width(18) });
+            enabled = GUIUnstrip.Toggle(enabled, "", new GUILayoutOption[] { GUILayout.Width(18) });
             if (obj.activeSelf != enabled)
             {
                 obj.SetActive(enabled);
@@ -81,7 +81,7 @@ namespace Explorer
 
             // ------- actual button ---------
 
-            if (GUILayout.Button(label, new GUILayoutOption[] { GUILayout.Height(22), GUILayout.Width(width) }))
+            if (GUIUnstrip.Button(label, new GUILayoutOption[] { GUILayout.Height(22), GUILayout.Width(width) }))
             {
                 if (specialInspectMethod != null)
                 {
@@ -103,12 +103,12 @@ namespace Explorer
                 SmallInspectButton(_obj);
             }
 
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
         }
 
         public static void SmallInspectButton(object obj)
         {
-            if (GUILayout.Button("Inspect", null))
+            if (GUIUnstrip.Button("Inspect"))
             {
                 WindowManager.InspectObject(obj, out bool _);
             }

src/Menu/UIStyles.cs

@@ -38,7 +38,7 @@ namespace Explorer
             var orig = GUI.color;
 
             GUI.color = _color;
-            GUILayout.Box(GUIContent.none, !small ? HorizontalBar : HorizontalBarSmall, null);
+            GUIUnstrip.Box(GUIContent.none, !small ? HorizontalBar : HorizontalBarSmall, null);
 
             GUI.color = orig;
         }

src/Menu/Windows/GameObjectWindow.cs

@@ -12,10 +12,12 @@ namespace Explorer
     public class GameObjectWindow : UIWindow
     {
         public override string Title => WindowManager.TabView
-            ? $"<color=cyan>[G]</color> {m_object.name}"
-            : $"GameObject Inspector ({m_object.name})";
+            ? $"<color=cyan>[G]</color> {TargetGO.name}"
+            : $"GameObject Inspector ({TargetGO.name})";
 
-        public GameObject m_object;
+        public GameObject TargetGO;
+
+        private static bool m_hideControls;
 
         // gui element holders
         private string m_name;
@@ -23,11 +25,11 @@ namespace Explorer
 
         private Transform[] m_children;
         private Vector2 m_transformScroll = Vector2.zero;
-        private PageHelper ChildPages = new PageHelper();
+        private readonly PageHelper ChildPages = new PageHelper();
 
         private Component[] m_components;
         private Vector2 m_compScroll = Vector2.zero;
-        private PageHelper CompPages = new PageHelper();
+        private readonly PageHelper CompPages = new PageHelper();
 
         private readonly Vector3[] m_cachedInput = new Vector3[3];
         private float m_translateAmount = 0.3f;
@@ -42,7 +44,7 @@ namespace Explorer
         private bool m_localContext;
 
         private readonly List<Component> m_cachedDestroyList = new List<Component>();
-        //private string m_addComponentInput = "";
+        private string m_addComponentInput = "";
 
         private string m_setParentInput = "Enter a GameObject name or path";
 
@@ -52,12 +54,12 @@ namespace Explorer
 
             if (targetType == typeof(GameObject))
             {
-                m_object = Target as GameObject;
+                TargetGO = Target as GameObject;
                 return true;
             }
             else if (targetType == typeof(Transform))
             {
-                m_object = (Target as Transform).gameObject;
+                TargetGO = (Target as Transform).gameObject;
                 return true;
             }
 
@@ -73,10 +75,10 @@ namespace Explorer
                 return;
             }
 
-            m_name = m_object.name;
-            m_scene = string.IsNullOrEmpty(m_object.scene.name) 
+            m_name = TargetGO.name;
+            m_scene = string.IsNullOrEmpty(TargetGO.scene.name) 
                         ? "None (Asset/Resource)" 
-                        : m_object.scene.name;
+                        : TargetGO.scene.name;
 
             CacheTransformValues();
 
@@ -87,15 +89,15 @@ namespace Explorer
         {
             if (m_localContext)
             {
-                m_cachedInput[0] = m_object.transform.localPosition;
-                m_cachedInput[1] = m_object.transform.localEulerAngles;
+                m_cachedInput[0] = TargetGO.transform.localPosition;
+                m_cachedInput[1] = TargetGO.transform.localEulerAngles;
             }
             else
             {
-                m_cachedInput[0] = m_object.transform.position;
-                m_cachedInput[1] = m_object.transform.eulerAngles;
+                m_cachedInput[0] = TargetGO.transform.position;
+                m_cachedInput[1] = TargetGO.transform.eulerAngles;
             }
-            m_cachedInput[2] = m_object.transform.localScale;
+            m_cachedInput[2] = TargetGO.transform.localScale;
         }
 
         public override void Update()
@@ -118,7 +120,7 @@ namespace Explorer
                     }
                 }
 
-                if (!m_object && !GetObjectAsGameObject())
+                if (!TargetGO && !GetObjectAsGameObject())
                 {
                     throw new Exception("Object is null!");
                 }
@@ -127,22 +129,22 @@ namespace Explorer
                 {
                     if (m_localContext)
                     {
-                        m_object.transform.localPosition = m_frozenPosition;
-                        m_object.transform.localRotation = m_frozenRotation;
+                        TargetGO.transform.localPosition = m_frozenPosition;
+                        TargetGO.transform.localRotation = m_frozenRotation;
                     }
                     else
                     {
-                        m_object.transform.position = m_frozenPosition;
-                        m_object.transform.rotation = m_frozenRotation;
+                        TargetGO.transform.position = m_frozenPosition;
+                        TargetGO.transform.rotation = m_frozenRotation;
                     }
-                    m_object.transform.localScale = m_frozenScale;
+                    TargetGO.transform.localScale = m_frozenScale;
                 }
 
                 // update child objects
                 var childList = new List<Transform>();
-                for (int i = 0; i < m_object.transform.childCount; i++)
+                for (int i = 0; i < TargetGO.transform.childCount; i++)
                 {
-                    childList.Add(m_object.transform.GetChild(i));
+                    childList.Add(TargetGO.transform.GetChild(i));
                 }
                 childList.Sort((a, b) => b.childCount.CompareTo(a.childCount));
                 m_children = childList.ToArray();
@@ -151,7 +153,7 @@ namespace Explorer
 
                 // update components
                 var compList = new Il2CppSystem.Collections.Generic.List<Component>();
-                m_object.GetComponentsInternal(ReflectionHelpers.ComponentType, true, false, true, false, compList);
+                TargetGO.GetComponentsInternal(ReflectionHelpers.ComponentType, true, false, true, false, compList);
 
                 m_components = compList.ToArray();
 
@@ -182,7 +184,7 @@ namespace Explorer
 
         private void ReflectObject(Il2CppSystem.Object obj)
         {
-            var window = WindowManager.InspectObject(obj, out bool created);
+            var window = WindowManager.InspectObject(obj, out bool created, true);
 
             if (created)
             {
@@ -210,57 +212,57 @@ namespace Explorer
                 if (!WindowManager.TabView)
                 {
                     Header();
-                    GUILayout.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
+                    GUIUnstrip.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
                 }
 
                 scroll = GUIUnstrip.BeginScrollView(scroll);
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("Scene: <color=cyan>" + (m_scene == "" ? "n/a" : m_scene) + "</color>", null);
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("Scene: <color=cyan>" + (m_scene == "" ? "n/a" : m_scene) + "</color>");
                 if (m_scene == UnityHelpers.ActiveSceneName)
                 {
-                    if (GUILayout.Button("<color=#00FF00>Send to Scene View</color>", new GUILayoutOption[] { GUILayout.Width(150) }))
+                    if (GUIUnstrip.Button("<color=#00FF00>Send to Scene View</color>", new GUILayoutOption[] { GUILayout.Width(150) }))
                     {
-                        ScenePage.Instance.SetTransformTarget(m_object.transform);
+                        ScenePage.Instance.SetTransformTarget(TargetGO.transform);
                         MainMenu.SetCurrentPage(0);
                     }
                 }
-                if (GUILayout.Button("Reflection Inspect", new GUILayoutOption[] { GUILayout.Width(150) }))
+                if (GUIUnstrip.Button("Reflection Inspect", new GUILayoutOption[] { GUILayout.Width(150) }))
                 {
                     WindowManager.InspectObject(Target, out _, true);
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("Path:", new GUILayoutOption[] { GUILayout.Width(50) });
-                string pathlabel = m_object.transform.GetGameObjectPath();
-                if (m_object.transform.parent != null)
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("Path:", new GUILayoutOption[] { GUILayout.Width(50) });
+                string pathlabel = TargetGO.transform.GetGameObjectPath();
+                if (TargetGO.transform.parent != null)
                 {
-                    if (GUILayout.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
+                    if (GUIUnstrip.Button("<-", new GUILayoutOption[] { GUILayout.Width(35) }))
                     {
-                        InspectGameObject(m_object.transform.parent);
+                        InspectGameObject(TargetGO.transform.parent);
                     }
                 }
-                GUILayout.TextArea(pathlabel, null);
-                GUILayout.EndHorizontal();
+                GUIUnstrip.TextArea(pathlabel);
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("Name:", new GUILayoutOption[] { GUILayout.Width(50) });
-                GUILayout.TextArea(m_name, null);
-                GUILayout.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("Name:", new GUILayoutOption[] { GUILayout.Width(50) });
+                GUIUnstrip.TextArea(m_name);
+                GUIUnstrip.EndHorizontal();
 
                 // --- Horizontal Columns section ---
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
 
-                GUILayout.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
+                GUIUnstrip.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
                 TransformList(rect);
-                GUILayout.EndVertical();
+                GUIUnstrip.EndVertical();
 
-                GUILayout.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
+                GUIUnstrip.BeginVertical(new GUILayoutOption[] { GUILayout.Width(rect.width / 2 - 17) });
                 ComponentList(rect);
-                GUILayout.EndVertical();
+                GUIUnstrip.EndVertical();
 
-                GUILayout.EndHorizontal(); // end horiz columns
+                GUIUnstrip.EndHorizontal(); // end horiz columns
 
                 GameObjectControls();
 
@@ -270,7 +272,7 @@ namespace Explorer
                 {
                     m_rect = ResizeDrag.ResizeWindow(rect, windowID);
 
-                    GUILayout.EndArea();
+                    GUIUnstrip.EndArea();
                 }
             }
             catch (Exception e)
@@ -281,31 +283,31 @@ namespace Explorer
 
         private void TransformList(Rect m_rect)
         {
-            GUILayout.BeginVertical(GUI.skin.box, null);
+            GUIUnstrip.BeginVertical(GUI.skin.box, null);
             m_transformScroll = GUIUnstrip.BeginScrollView(m_transformScroll);
 
-            GUILayout.Label("<b><size=15>Children</size></b>", null);
+            GUIUnstrip.Label("<b><size=15>Children</size></b>");
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             ChildPages.DrawLimitInputArea();
 
             if (ChildPages.ItemCount > ChildPages.ItemsPerPage)
             {
                 ChildPages.CurrentPageLabel();
 
-                GUILayout.EndHorizontal();
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
 
-                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
                 {
                     ChildPages.TurnPage(Turn.Left, ref this.m_transformScroll);
                 }
-                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
                 {
                     ChildPages.TurnPage(Turn.Right, ref this.m_transformScroll);
                 }
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
             if (m_children != null && m_children.Length > 0)
             {
@@ -317,7 +319,7 @@ namespace Explorer
 
                     if (!obj)
                     {
-                        GUILayout.Label("null", null);
+                        GUIUnstrip.Label("null");
                         continue;
                     }
 
@@ -326,39 +328,62 @@ namespace Explorer
             }
             else
             {
-                GUILayout.Label("<i>None</i>", null);
+                GUIUnstrip.Label("<i>None</i>");
             }
 
             GUIUnstrip.EndScrollView();
-            GUILayout.EndVertical();
+            GUIUnstrip.EndVertical();
         }
 
         private void ComponentList(Rect m_rect)
         {
-            GUILayout.BeginVertical(GUI.skin.box, null);
+            GUIUnstrip.BeginVertical(GUI.skin.box, null);
             m_compScroll = GUIUnstrip.BeginScrollView(m_compScroll);
-            GUILayout.Label("<b><size=15>Components</size></b>", null);
+            GUIUnstrip.Label("<b><size=15>Components</size></b>");
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             CompPages.DrawLimitInputArea();
 
             if (CompPages.ItemCount > CompPages.ItemsPerPage)
             {
                 CompPages.CurrentPageLabel();
 
-                GUILayout.EndHorizontal();
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
 
-                if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
                 {
                     CompPages.TurnPage(Turn.Left, ref this.m_compScroll);
                 }
-                if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
                 {
                     CompPages.TurnPage(Turn.Right, ref this.m_compScroll);
                 }
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
+
+            GUIUnstrip.BeginHorizontal();
+            var width = m_rect.width / 2 - 115f;
+            m_addComponentInput = GUIUnstrip.TextField(m_addComponentInput, new GUILayoutOption[] { GUILayout.Width(width) });
+            if (GUIUnstrip.Button("Add Comp"))
+            {
+                if (ReflectionHelpers.GetTypeByName(m_addComponentInput) is Type compType)
+                {
+                    if (typeof(Component).IsAssignableFrom(compType))
+                    {
+                        TargetGO.AddComponent(Il2CppType.From(compType));
+                    }
+                    else
+                    {
+                        MelonLogger.LogWarning($"Type '{compType.Name}' is not assignable from Component!");
+                    }
+                }
+                else
+                {
+                    MelonLogger.LogWarning($"Could not find a type by the name of '{m_addComponentInput}'!");
+                }
+            }
+            GUIUnstrip.EndHorizontal();
 
             GUI.skin.button.alignment = TextAnchor.MiddleLeft;
             if (m_cachedDestroyList.Count > 0)
@@ -378,24 +403,24 @@ namespace Explorer
 
                     var ilType = component.GetIl2CppType();
 
-                    GUILayout.BeginHorizontal(null);
+                    GUIUnstrip.BeginHorizontal();
                     if (ReflectionHelpers.BehaviourType.IsAssignableFrom(ilType))
                     {
                         BehaviourEnabledBtn(component.TryCast<Behaviour>());
                     }
                     else
                     {
-                        GUILayout.Space(26);
+                        GUIUnstrip.Space(26);
                     }
-                    if (GUILayout.Button("<color=cyan>" + ilType.Name + "</color>", new GUILayoutOption[] { GUILayout.Width(m_rect.width / 2 - 100) }))
+                    if (GUIUnstrip.Button("<color=cyan>" + ilType.Name + "</color>", new GUILayoutOption[] { GUILayout.Width(m_rect.width / 2 - 100) }))
                     {
                         ReflectObject(component);
                     }
-                    if (GUILayout.Button("<color=red>-</color>", new GUILayoutOption[] { GUILayout.Width(20) }))
+                    if (GUIUnstrip.Button("<color=red>-</color>", new GUILayoutOption[] { GUILayout.Width(20) }))
                     {
                         m_cachedDestroyList.Add(component);
                     }
-                    GUILayout.EndHorizontal();
+                    GUIUnstrip.EndHorizontal();
                 }
             }
 
@@ -411,7 +436,7 @@ namespace Explorer
 
             GUIUnstrip.EndScrollView();
 
-            GUILayout.EndVertical();
+            GUIUnstrip.EndVertical();
         }
 
         private void BehaviourEnabledBtn(Behaviour obj)
@@ -429,7 +454,7 @@ namespace Explorer
 
             // ------ toggle active button ------
 
-            _enabled = GUILayout.Toggle(_enabled, "", new GUILayoutOption[] { GUILayout.Width(18) });
+            _enabled = GUIUnstrip.Toggle(_enabled, "", new GUILayoutOption[] { GUILayout.Width(18) });
             if (obj.enabled != _enabled)
             {
                 obj.enabled = _enabled;
@@ -439,25 +464,45 @@ namespace Explorer
 
         private void GameObjectControls()
         {
-            GUILayout.BeginVertical(GUI.skin.box, new GUILayoutOption[] { GUILayout.Width(520) });
-            GUILayout.Label("<b><size=15>GameObject Controls</size></b>", null);
-
-            GUILayout.BeginHorizontal(null);
-            bool m_active = m_object.activeSelf;
-            m_active = GUILayout.Toggle(m_active, (m_active ? "<color=lime>Enabled " : "<color=red>Disabled") + "</color>",
-                new GUILayoutOption[] { GUILayout.Width(80) });
-            if (m_object.activeSelf != m_active) { m_object.SetActive(m_active); }
-
-            UIHelpers.InstantiateButton(m_object, 100);
-
-            if (GUILayout.Button("Set DontDestroyOnLoad", new GUILayoutOption[] { GUILayout.Width(170) }))
+            if (m_hideControls)
             {
-                GameObject.DontDestroyOnLoad(m_object);
-                m_object.hideFlags |= HideFlags.DontUnloadUnusedAsset;
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("<b><size=15>GameObject Controls</size></b>", new GUILayoutOption[] { GUILayout.Width(200) });
+                if (GUIUnstrip.Button("^ Show ^", new GUILayoutOption[] { GUILayout.Width(75) }))
+                {
+                    m_hideControls = false;
+                }
+                GUIUnstrip.EndHorizontal();
+
+                return;
+            }
+
+            GUIUnstrip.BeginVertical(GUI.skin.box, new GUILayoutOption[] { GUILayout.Width(520) });
+
+            GUIUnstrip.BeginHorizontal();
+            GUIUnstrip.Label("<b><size=15>GameObject Controls</size></b>", new GUILayoutOption[] { GUILayout.Width(200) });
+            if (GUIUnstrip.Button("v Hide v", new GUILayoutOption[] { GUILayout.Width(75) }))
+            {
+                m_hideControls = true;
+            }
+            GUIUnstrip.EndHorizontal();
+
+            GUIUnstrip.BeginHorizontal();
+            bool m_active = TargetGO.activeSelf;
+            m_active = GUIUnstrip.Toggle(m_active, (m_active ? "<color=lime>Enabled " : "<color=red>Disabled") + "</color>",
+                new GUILayoutOption[] { GUILayout.Width(80) });
+            if (TargetGO.activeSelf != m_active) { TargetGO.SetActive(m_active); }
+
+            UIHelpers.InstantiateButton(TargetGO, 100);
+
+            if (GUIUnstrip.Button("Set DontDestroyOnLoad", new GUILayoutOption[] { GUILayout.Width(170) }))
+            {
+                GameObject.DontDestroyOnLoad(TargetGO);
+                TargetGO.hideFlags |= HideFlags.DontUnloadUnusedAsset;
             }
 
             var lbl = m_freeze ? "<color=lime>Unfreeze</color>" : "<color=orange>Freeze Pos/Rot</color>";
-            if (GUILayout.Button(lbl, new GUILayoutOption[] { GUILayout.Width(110) }))
+            if (GUIUnstrip.Button(lbl, new GUILayoutOption[] { GUILayout.Width(110) }))
             {
                 m_freeze = !m_freeze;
                 if (m_freeze)
@@ -466,15 +511,15 @@ namespace Explorer
                 }
             }
 
-            GUILayout.EndHorizontal();
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.EndHorizontal();
+            GUIUnstrip.BeginHorizontal();
 
-            m_setParentInput = GUILayout.TextField(m_setParentInput, null);
-            if (GUILayout.Button("Set Parent", new GUILayoutOption[] { GUILayout.Width(80) }))
+            m_setParentInput = GUIUnstrip.TextField(m_setParentInput);
+            if (GUIUnstrip.Button("Set Parent", new GUILayoutOption[] { GUILayout.Width(80) }))
             {
                 if (GameObject.Find(m_setParentInput) is GameObject newparent)
                 {
-                    m_object.transform.parent = newparent.transform;
+                    TargetGO.transform.parent = newparent.transform;
                 }
                 else
                 {
@@ -482,51 +527,51 @@ namespace Explorer
                 }
             }
 
-            if (GUILayout.Button("Detach from parent", new GUILayoutOption[] { GUILayout.Width(160) }))
+            if (GUIUnstrip.Button("Detach from parent", new GUILayoutOption[] { GUILayout.Width(160) }))
             {
-                m_object.transform.parent = null;
+                TargetGO.transform.parent = null;
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
-            GUILayout.BeginVertical(GUI.skin.box, null);
+            GUIUnstrip.BeginVertical(GUI.skin.box, null);
 
             m_cachedInput[0] = TranslateControl(TranslateType.Position, ref m_translateAmount,  false);
             m_cachedInput[1] = TranslateControl(TranslateType.Rotation, ref m_rotateAmount,     true);
             m_cachedInput[2] = TranslateControl(TranslateType.Scale,    ref m_scaleAmount,      false);
 
-            GUILayout.BeginHorizontal(null);
-            if (GUILayout.Button("<color=lime>Apply to Transform</color>", null) || m_autoApplyTransform)
+            GUIUnstrip.BeginHorizontal();
+            if (GUIUnstrip.Button("<color=lime>Apply to Transform</color>") || m_autoApplyTransform)
             {
                 if (m_localContext)
                 {
-                    m_object.transform.localPosition = m_cachedInput[0];
-                    m_object.transform.localEulerAngles = m_cachedInput[1];
+                    TargetGO.transform.localPosition = m_cachedInput[0];
+                    TargetGO.transform.localEulerAngles = m_cachedInput[1];
                 }
                 else
                 {
-                    m_object.transform.position = m_cachedInput[0];
-                    m_object.transform.eulerAngles = m_cachedInput[1];
+                    TargetGO.transform.position = m_cachedInput[0];
+                    TargetGO.transform.eulerAngles = m_cachedInput[1];
                 }
-                m_object.transform.localScale = m_cachedInput[2];
+                TargetGO.transform.localScale = m_cachedInput[2];
 
                 if (m_freeze)
                 {
                     UpdateFreeze();
                 }
             }
-            if (GUILayout.Button("<color=lime>Update from Transform</color>", null) || m_autoUpdateTransform)
+            if (GUIUnstrip.Button("<color=lime>Update from Transform</color>") || m_autoUpdateTransform)
             {
                 CacheTransformValues();
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             BoolToggle(ref m_autoApplyTransform, "Auto-apply to Transform?");
             BoolToggle(ref m_autoUpdateTransform, "Auto-update from transform?");
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
             bool b = m_localContext;
-            b = GUILayout.Toggle(b, "<color=" + (b ? "lime" : "red") + ">Use local transform values?</color>", null);
+            b = GUIUnstrip.Toggle(b, "<color=" + (b ? "lime" : "red") + ">Use local transform values?</color>");
             if (b != m_localContext)
             {
                 m_localContext = b;
@@ -537,31 +582,31 @@ namespace Explorer
                 }
             }
 
-            GUILayout.EndVertical();
+            GUIUnstrip.EndVertical();
 
-            if (GUILayout.Button("<color=red><b>Destroy</b></color>", new GUILayoutOption[] { GUILayout.Width(120) }))
+            if (GUIUnstrip.Button("<color=red><b>Destroy</b></color>", new GUILayoutOption[] { GUILayout.Width(120) }))
             {
-                GameObject.Destroy(m_object);
+                GameObject.Destroy(TargetGO);
                 DestroyWindow();
                 return;
             }
 
-            GUILayout.EndVertical();
+            GUIUnstrip.EndVertical();
         }
 
         private void UpdateFreeze()
         {
             if (m_localContext)
             {
-                m_frozenPosition = m_object.transform.localPosition;
-                m_frozenRotation = m_object.transform.localRotation;
+                m_frozenPosition = TargetGO.transform.localPosition;
+                m_frozenRotation = TargetGO.transform.localRotation;
             }
             else
             {
-                m_frozenPosition = m_object.transform.position;
-                m_frozenRotation = m_object.transform.rotation;
+                m_frozenPosition = TargetGO.transform.position;
+                m_frozenRotation = TargetGO.transform.rotation;
             }
-            m_frozenScale = m_object.transform.localScale;
+            m_frozenScale = TargetGO.transform.localScale;
         }
 
         private void BoolToggle(ref bool value, string message)
@@ -570,7 +615,7 @@ namespace Explorer
             lbl += value ? "lime" : "red";
             lbl += $">{message}</color>";
 
-            value = GUILayout.Toggle(value, lbl, null);
+            value = GUIUnstrip.Toggle(value, lbl);
         }
 
         public enum TranslateType
@@ -582,51 +627,51 @@ namespace Explorer
 
         private Vector3 TranslateControl(TranslateType mode, ref float amount, bool multByTime)
         {
-            GUILayout.BeginHorizontal(null);
-            GUILayout.Label($"<color=cyan><b>{(m_localContext ? "Local " : "")}{mode}</b></color>:", 
+            GUIUnstrip.BeginHorizontal();
+            GUIUnstrip.Label($"<color=cyan><b>{(m_localContext ? "Local " : "")}{mode}</b></color>:", 
                 new GUILayoutOption[] { GUILayout.Width(m_localContext ? 110 : 65) });
 
-            var transform = m_object.transform;
+            var transform = TargetGO.transform;
             switch (mode)
             {
                 case TranslateType.Position:
                     var pos = m_localContext ? transform.localPosition : transform.position;
-                    GUILayout.Label(pos.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
+                    GUIUnstrip.Label(pos.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
                     break;
                 case TranslateType.Rotation:
                     var rot = m_localContext ? transform.localEulerAngles : transform.eulerAngles;
-                    GUILayout.Label(rot.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
+                    GUIUnstrip.Label(rot.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
                     break;
                 case TranslateType.Scale:
-                    GUILayout.Label(transform.localScale.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
+                    GUIUnstrip.Label(transform.localScale.ToString(), new GUILayoutOption[] { GUILayout.Width(250) });
                     break;
             }
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
             Vector3 input = m_cachedInput[(int)mode];
 
-            GUILayout.BeginHorizontal(null);
+            GUIUnstrip.BeginHorizontal();
             GUI.skin.label.alignment = TextAnchor.MiddleRight;
 
-            GUILayout.Label("<color=cyan>X:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
+            GUIUnstrip.Label("<color=cyan>X:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
             PlusMinusFloat(ref input.x, amount, multByTime);
 
-            GUILayout.Label("<color=cyan>Y:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
+            GUIUnstrip.Label("<color=cyan>Y:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
             PlusMinusFloat(ref input.y, amount, multByTime);
 
-            GUILayout.Label("<color=cyan>Z:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
+            GUIUnstrip.Label("<color=cyan>Z:</color>", new GUILayoutOption[] { GUILayout.Width(20) });
             PlusMinusFloat(ref input.z, amount, multByTime);            
 
-            GUILayout.Label("+/-:", new GUILayoutOption[] { GUILayout.Width(30) });
+            GUIUnstrip.Label("+/-:", new GUILayoutOption[] { GUILayout.Width(30) });
             var amountInput = amount.ToString("F3");
-            amountInput = GUILayout.TextField(amountInput, new GUILayoutOption[] { GUILayout.Width(60) });
+            amountInput = GUIUnstrip.TextField(amountInput, new GUILayoutOption[] { GUILayout.Width(60) });
             if (float.TryParse(amountInput, out float f))
             {
                 amount = f;
             }
 
             GUI.skin.label.alignment = TextAnchor.UpperLeft;
-            GUILayout.EndHorizontal();
+            GUIUnstrip.EndHorizontal();
 
             return input;
         }
@@ -634,16 +679,16 @@ namespace Explorer
         private void PlusMinusFloat(ref float f, float amount, bool multByTime)
         {
             string s = f.ToString("F3");
-            s = GUILayout.TextField(s, new GUILayoutOption[] { GUILayout.Width(60) });
+            s = GUIUnstrip.TextField(s, new GUILayoutOption[] { GUILayout.Width(60) });
             if (float.TryParse(s, out float f2))
             {
                 f = f2;
             }
-            if (GUILayout.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
+            if (GUIUnstrip.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
             {
                 f -= multByTime ? amount * Time.deltaTime : amount;
             }
-            if (GUILayout.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
+            if (GUIUnstrip.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
             {
                 f += multByTime ? amount * Time.deltaTime : amount;
             }

src/Menu/Windows/ReflectionWindow.cs

@@ -28,20 +28,32 @@ namespace Explorer
         public MemberTypes m_filter = MemberTypes.Property;
         private bool m_hideFailedReflection = false;
 
-        // some extra caching
+        // some extra cast-caching
         private UnityEngine.Object m_uObj;
         private Component m_component;
 
+        private static readonly HashSet<string> _typeAndMemberBlacklist = new HashSet<string>
+        {
+            // Causes a crash
+            "Type.DeclaringMethod",
+            // Causes a crash
+            "Rigidbody2D.Cast",
+        };
+
+        private static readonly HashSet<string> _methodStartsWithBlacklist = new HashSet<string>
+        {
+            // Pointless (handled by Properties)
+            "get_",
+            "set_",
+        };
+
         public override void Init()
         {
-            var type = ReflectionHelpers.GetActualType(Target);
+            TargetType = ReflectionHelpers.GetActualType(Target);
 
-            TargetType = type;
-
-            var types = ReflectionHelpers.GetAllBaseTypes(Target);
-
-            CacheMembers(types);
+            CacheMembers(ReflectionHelpers.GetAllBaseTypes(Target));
 
+            // cache the extra cast-caching
             if (Target is Il2CppSystem.Object ilObject)
             {
                 var unityObj = ilObject.TryCast<UnityEngine.Object>();
@@ -56,13 +68,6 @@ namespace Explorer
                     }
                 }
             }
-
-            m_filter = MemberTypes.All;
-            m_autoUpdate = true;
-            Update();
-
-            m_autoUpdate = false;
-            m_filter = MemberTypes.Property;
         }
 
         public override void Update()
@@ -99,28 +104,32 @@ namespace Explorer
 
         private bool ShouldProcessMember(CacheObjectBase holder)
         {
-            if (m_filter != MemberTypes.All && m_filter != holder.MemInfo?.MemberType) return false;
+            // check MemberTypes filter
+            if (m_filter != MemberTypes.All && m_filter != holder.MemInfo?.MemberType) 
+                return false;
 
-            if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection) return false;
+            // hide failed reflection
+            if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection) 
+                return false;
 
-            if (m_search == "" || holder.MemInfo == null) return true;
+            // see if we should do name search
+            if (m_search == "" || holder.MemInfo == null) 
+                return true;
 
-            var name = holder.MemInfo.DeclaringType.Name + "." + holder.MemInfo.Name;
-
-            return name.ToLower().Contains(m_search.ToLower());
+            // ok do name search
+            return (holder.MemInfo.DeclaringType.Name + "." + holder.MemInfo.Name)
+                    .ToLower()
+                    .Contains(m_search.ToLower());
         }
 
         private void CacheMembers(Type[] types)
         {
             var list = new List<CacheObjectBase>();
-
-            var names = new List<string>();
+            var cachedSigs = new List<string>();
 
             foreach (var declaringType in types)
             {
                 MemberInfo[] infos;
-                string exception = null;
-
                 try
                 {
                     infos = declaringType.GetMembers(ReflectionHelpers.CommonFlags);
@@ -132,6 +141,7 @@ namespace Explorer
                 }
 
                 object target = Target;
+                string exception = null;
 
                 if (target is Il2CppSystem.Object ilObject)
                 {
@@ -147,46 +157,62 @@ namespace Explorer
 
                 foreach (var member in infos)
                 {
-                    if (member.MemberType == MemberTypes.Field || member.MemberType == MemberTypes.Property || member.MemberType == MemberTypes.Method)
+                    // make sure member type is Field, Method of Property (4 / 8 / 16)
+                    int m = (int)member.MemberType;
+                    if (m < 4 || m > 16)
+                        continue;
+
+                    // check blacklisted members
+                    var name = member.DeclaringType.Name + "." + member.Name;
+                    if (_typeAndMemberBlacklist.Any(it => it == name))
+                        continue;
+
+                    if (_methodStartsWithBlacklist.Any(it => member.Name.StartsWith(it)))
+                        continue;
+
+                    // compare signature to already cached members
+                    var signature = $"{member.DeclaringType.Name}.{member.Name}";
+                    if (member is MethodInfo mi)
                     {
-                        var name = $"{member.DeclaringType.Name}.{member.Name}";
+                        AppendParams(mi.GetParameters());
+                    }
+                    else if (member is PropertyInfo pi)
+                    {
+                        AppendParams(pi.GetIndexParameters());
+                    }
 
-                        // blacklist (should probably make a proper implementation)
-                        if (name == "Type.DeclaringMethod" || member.Name.StartsWith("get_") || member.Name.StartsWith("set_")) //|| member.Name.Contains("Il2CppType")
+                    void AppendParams(ParameterInfo[] _args)
+                    {
+                        signature += " (";
+                        foreach (var param in _args)
                         {
-                            continue;
+                            signature += $"{param.ParameterType.Name} {param.Name}, ";
                         }
+                        signature += ")";
+                    }
 
-                        if (member is MethodInfo mi)
-                        {
-                            name += " (";
-                            foreach (var param in mi.GetParameters())
-                            {
-                                name += param.ParameterType.Name + ", ";
-                            }
-                            name += ")";
-                        }
-                        if (names.Contains(name))
-                        {
-                            continue;
-                        }
+                    if (cachedSigs.Contains(signature))
+                    {
+                        continue;
+                    }
 
-                        try
+                    // MelonLogger.Log($"Trying to cache member {signature}...");
+
+                    try
+                    {
+                        var cached = CacheObjectBase.GetCacheObject(member, target);
+                        if (cached != null)
                         {
-                            var cached = CacheObjectBase.GetCacheObject(member, target);
-                            if (cached != null)
-                            {
-                                names.Add(name);
-                                list.Add(cached);
-                                cached.ReflectionException = exception;
-                            }
-                        }
-                        catch (Exception e) 
-                        {
-                            MelonLogger.LogWarning($"Exception caching member {name}!");
-                            MelonLogger.Log(e.ToString());
+                            cachedSigs.Add(signature);
+                            list.Add(cached);
+                            cached.ReflectionException = exception;
                         }
                     }
+                    catch (Exception e)
+                    {
+                        MelonLogger.LogWarning($"Exception caching member {signature}!");
+                        MelonLogger.Log(e.ToString());
+                    }
                 }
             }
 
@@ -206,100 +232,100 @@ namespace Explorer
                 if (!WindowManager.TabView)
                 {
                     Header();
-                    GUILayout.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
+                    GUIUnstrip.BeginArea(new Rect(5, 25, rect.width - 10, rect.height - 35), GUI.skin.box);
                 }
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("<b>Type:</b> <color=cyan>" + TargetType.FullName + "</color>", new GUILayoutOption[] { GUILayout.Width(245f) });
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("<b>Type:</b> <color=cyan>" + TargetType.FullName + "</color>", new GUILayoutOption[] { GUILayout.Width(245f) });
                 if (m_uObj)
                 {
-                    GUILayout.Label("Name: " + m_uObj.name, null);
+                    GUIUnstrip.Label("Name: " + m_uObj.name);
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
                 if (m_uObj)
                 {
-                    GUILayout.BeginHorizontal(null);
-                    GUILayout.Label("<b>Tools:</b>", new GUILayoutOption[] { GUILayout.Width(80) });
+                    GUIUnstrip.BeginHorizontal();
+                    GUIUnstrip.Label("<b>Tools:</b>", new GUILayoutOption[] { GUILayout.Width(80) });
                     UIHelpers.InstantiateButton(m_uObj);
                     if (m_component && m_component.gameObject is GameObject obj)
                     {
                         GUI.skin.label.alignment = TextAnchor.MiddleRight;
-                        GUILayout.Label("GameObject:", new GUILayoutOption[] { GUILayout.Width(135) });
+                        GUIUnstrip.Label("GameObject:", new GUILayoutOption[] { GUILayout.Width(135) });
                         var charWidth = obj.name.Length * 15;
                         var maxWidth = rect.width - 350;
                         var labelWidth = charWidth < maxWidth ? charWidth : maxWidth; 
-                        if (GUILayout.Button("<color=#00FF00>" + obj.name + "</color>", new GUILayoutOption[] { GUILayout.Width(labelWidth) }))
+                        if (GUIUnstrip.Button("<color=#00FF00>" + obj.name + "</color>", new GUILayoutOption[] { GUILayout.Width(labelWidth) }))
                         {
                             WindowManager.InspectObject(obj, out bool _);
                         }
                         GUI.skin.label.alignment = TextAnchor.UpperLeft;
                     }
-                    GUILayout.EndHorizontal();
+                    GUIUnstrip.EndHorizontal();
                 }
 
                 UIStyles.HorizontalLine(Color.grey);
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("<b>Search:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
-                m_search = GUILayout.TextField(m_search, null);                
-                GUILayout.EndHorizontal();
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("<b>Search:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
+                m_search = GUIUnstrip.TextField(m_search);                
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("<b>Filter:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("<b>Filter:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
                 FilterToggle(MemberTypes.All, "All");
                 FilterToggle(MemberTypes.Property, "Properties");
                 FilterToggle(MemberTypes.Field, "Fields");
                 FilterToggle(MemberTypes.Method, "Methods");
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.BeginHorizontal(null);
-                GUILayout.Label("<b>Values:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
-                if (GUILayout.Button("Update", new GUILayoutOption[] { GUILayout.Width(100) }))
+                GUIUnstrip.BeginHorizontal();
+                GUIUnstrip.Label("<b>Values:</b>", new GUILayoutOption[] { GUILayout.Width(75) });
+                if (GUIUnstrip.Button("Update", new GUILayoutOption[] { GUILayout.Width(100) }))
                 {
                     UpdateValues();
                 }
                 GUI.color = m_autoUpdate ? Color.green : Color.red;
-                m_autoUpdate = GUILayout.Toggle(m_autoUpdate, "Auto-update?", new GUILayoutOption[] { GUILayout.Width(100) });
+                m_autoUpdate = GUIUnstrip.Toggle(m_autoUpdate, "Auto-update?", new GUILayoutOption[] { GUILayout.Width(100) });
                 GUI.color = m_hideFailedReflection ? Color.green : Color.red;
-                m_hideFailedReflection = GUILayout.Toggle(m_hideFailedReflection, "Hide failed Reflection?", new GUILayoutOption[] { GUILayout.Width(150) });
+                m_hideFailedReflection = GUIUnstrip.Toggle(m_hideFailedReflection, "Hide failed Reflection?", new GUILayoutOption[] { GUILayout.Width(150) });
                 GUI.color = Color.white;
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
-                GUILayout.Space(10);
+                GUIUnstrip.Space(10);
 
                 Pages.ItemCount = m_cachedMembersFiltered.Length;
 
                 // prev/next page buttons
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginHorizontal();
 
                 Pages.DrawLimitInputArea();
 
                 if (Pages.ItemCount > Pages.ItemsPerPage)
                 {
-                    if (GUILayout.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
+                    if (GUIUnstrip.Button("< Prev", new GUILayoutOption[] { GUILayout.Width(80) }))
                     {
                         Pages.TurnPage(Turn.Left, ref this.scroll);
                     }
 
                     Pages.CurrentPageLabel();
 
-                    if (GUILayout.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
+                    if (GUIUnstrip.Button("Next >", new GUILayoutOption[] { GUILayout.Width(80) }))
                     {
                         Pages.TurnPage(Turn.Right, ref this.scroll);
                     }
                 }
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
 
                 // ====== BODY ======
 
                 scroll = GUIUnstrip.BeginScrollView(scroll);
 
-                GUILayout.Space(10);
+                GUIUnstrip.Space(10);
 
                 UIStyles.HorizontalLine(Color.grey);
 
-                GUILayout.BeginVertical(GUI.skin.box, null);
+                GUIUnstrip.BeginVertical(GUI.skin.box, null);
 
                 var members = this.m_cachedMembersFiltered;
                 int start = Pages.CalculateOffsetIndex();
@@ -308,31 +334,31 @@ namespace Explorer
                 {
                     var holder = members[j];
 
-                    GUILayout.BeginHorizontal(new GUILayoutOption[] { GUILayout.Height(25) });
+                    GUIUnstrip.BeginHorizontal(new GUILayoutOption[] { GUILayout.Height(25) });
                     try 
                     { 
                         holder.Draw(rect, 180f);
                     } 
                     catch 
                     {
-                        GUILayout.EndHorizontal();
+                        GUIUnstrip.EndHorizontal();
                         continue;
                     }
-                    GUILayout.EndHorizontal();
+                    GUIUnstrip.EndHorizontal();
 
                     // if not last element
                     if (!(j == (start + Pages.ItemsPerPage - 1) || j == (members.Length - 1)))
                         UIStyles.HorizontalLine(new Color(0.07f, 0.07f, 0.07f), true);
                 }
 
-                GUILayout.EndVertical();
+                GUIUnstrip.EndVertical();
                 GUIUnstrip.EndScrollView();
 
                 if (!WindowManager.TabView)
                 {
                     m_rect = ResizeDrag.ResizeWindow(rect, windowID);
 
-                    GUILayout.EndArea();
+                    GUIUnstrip.EndArea();
                 }
             }
             catch (Il2CppException e)
@@ -360,7 +386,7 @@ namespace Explorer
             {
                 GUI.color = Color.white;
             }
-            if (GUILayout.Button(label, new GUILayoutOption[] { GUILayout.Width(100) }))
+            if (GUIUnstrip.Button(label, new GUILayoutOption[] { GUILayout.Width(100) }))
             {
                 m_filter = mode;
                 Pages.PageOffset = 0;

src/Menu/Windows/ResizeDrag.cs

@@ -26,17 +26,17 @@ namespace Explorer
 
                 try
                 {
-                    GUILayout.BeginHorizontal(GUI.skin.box, null);
+                    GUIUnstrip.BeginHorizontal(GUI.skin.box, null);
 
                     GUI.skin.label.alignment = TextAnchor.MiddleCenter;
-                    GUILayout.Button(gcDrag, GUI.skin.label, new GUILayoutOption[] { GUILayout.Height(15) });
+                    GUIUnstrip.Button(gcDrag, GUI.skin.label, new GUILayoutOption[] { GUILayout.Height(15) });
 
                     //var r = GUILayoutUtility.GetLastRect();
-                    var r = GUIUnstrip.GetLastRect();
+                    var r = LayoutUtilityUnstrip.GetLastRect();
 
                     var mousePos = InputHelper.mousePosition;
 
-                    Vector2 mouse = GUIUtility.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
+                    var mouse = GUIUnstrip.ScreenToGUIPoint(new Vector2(mousePos.x, Screen.height - mousePos.y));
 
                     if (r.Contains(mouse) && InputHelper.GetMouseButtonDown(0))
                     {
@@ -57,7 +57,7 @@ namespace Explorer
                         _rect.yMax = Mathf.Min(Screen.height, _rect.yMax);  // modifying yMax affects height, not y
                     }
 
-                    GUILayout.EndHorizontal();
+                    GUIUnstrip.EndHorizontal();
                 }
                 catch (Il2CppException e) when (e.Message.StartsWith("System.ArgumentException"))
                 {
@@ -76,31 +76,31 @@ namespace Explorer
             }
             else
             {
-                GUILayout.BeginHorizontal(GUI.skin.box, null);
+                GUIUnstrip.BeginHorizontal(GUI.skin.box, null);
 
-                GUILayout.Label("Resize window:", new GUILayoutOption[] { GUILayout.Width(100) });
+                GUIUnstrip.Label("Resize window:", new GUILayoutOption[] { GUILayout.Width(100) });
 
                 GUI.skin.label.alignment = TextAnchor.MiddleRight;
-                GUILayout.Label("<color=cyan>Width:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
-                if (GUILayout.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
+                GUIUnstrip.Label("<color=cyan>Width:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
+                if (GUIUnstrip.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
                 {
                     _rect.width -= 5f;
                 }
-                if (GUILayout.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
+                if (GUIUnstrip.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
                 {
                     _rect.width += 5f;
                 }
-                GUILayout.Label("<color=cyan>Height:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
-                if (GUILayout.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
+                GUIUnstrip.Label("<color=cyan>Height:</color>", new GUILayoutOption[] { GUILayout.Width(60) });
+                if (GUIUnstrip.RepeatButton("-", new GUILayoutOption[] { GUILayout.Width(20) }))
                 {
                     _rect.height -= 5f;
                 }
-                if (GUILayout.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
+                if (GUIUnstrip.RepeatButton("+", new GUILayoutOption[] { GUILayout.Width(20) }))
                 {
                     _rect.height += 5f;
                 }
 
-                GUILayout.EndHorizontal();
+                GUIUnstrip.EndHorizontal();
                 GUI.skin.label.alignment = TextAnchor.UpperLeft;
             }
 

src/Menu/Windows/TabViewWindow.cs

@@ -65,10 +65,10 @@ namespace Explorer
                     return;
                 }
 
-                GUILayout.BeginArea(new Rect(5, 25, m_rect.width - 10, m_rect.height - 35), GUI.skin.box);
+                GUIUnstrip.BeginArea(new Rect(5, 25, m_rect.width - 10, m_rect.height - 35), GUI.skin.box);
 
-                GUILayout.BeginVertical(GUI.skin.box, null);
-                GUILayout.BeginHorizontal(null);
+                GUIUnstrip.BeginVertical(GUI.skin.box, null);
+                GUIUnstrip.BeginHorizontal();
                 GUI.skin.button.alignment = TextAnchor.MiddleLeft;
                 int tabPerRow = Mathf.FloorToInt((float)((decimal)m_rect.width / 238));
                 int rowCount = 0;
@@ -77,8 +77,8 @@ namespace Explorer
                     if (rowCount >= tabPerRow)
                     {
                         rowCount = 0;
-                        GUILayout.EndHorizontal();
-                        GUILayout.BeginHorizontal(null);
+                        GUIUnstrip.EndHorizontal();
+                        GUIUnstrip.BeginHorizontal();
                     }
                     rowCount++;
 
@@ -87,18 +87,18 @@ namespace Explorer
                     GUI.color = focused ? Color.green : Color.white;
 
                     var window = WindowManager.Windows[i];
-                    if (GUILayout.Button(color + window.Title + "</color>", new GUILayoutOption[] { GUILayout.Width(200) }))
+                    if (GUIUnstrip.Button(color + window.Title + "</color>", new GUILayoutOption[] { GUILayout.Width(200) }))
                     {
                         TargetTabID = i;
                     }
-                    if (GUILayout.Button("<color=red><b>X</b></color>", new GUILayoutOption[] { GUILayout.Width(22) }))
+                    if (GUIUnstrip.Button("<color=red><b>X</b></color>", new GUILayoutOption[] { GUILayout.Width(22) }))
                     {
                         window.DestroyWindow();
                     }
                 }
                 GUI.color = Color.white;
-                GUILayout.EndHorizontal();
-                GUILayout.EndVertical();
+                GUIUnstrip.EndHorizontal();
+                GUIUnstrip.EndVertical();
                 GUI.skin.button.alignment = TextAnchor.MiddleCenter;
 
                 m_targetWindow.WindowFunction(m_targetWindow.windowID);
@@ -109,7 +109,7 @@ namespace Explorer
                 }
                 catch { }
 
-                GUILayout.EndArea();
+                GUIUnstrip.EndArea();
             }
             catch { }
         }

src/Menu/Windows/UIWindow.cs

@@ -17,7 +17,7 @@ namespace Explorer
         public object Target;
 
         public int windowID;
-        public Rect m_rect = new Rect(0, 0, 550, 700);
+        public Rect m_rect = new Rect(0,0, ModConfig.Instance.Default_Window_Size.x,ModConfig.Instance.Default_Window_Size.y);
 
         public Vector2 scroll = Vector2.zero;
 
@@ -49,15 +49,7 @@ namespace Explorer
 
         public void OnGUI()
         {
-            if (CppExplorer.ShowMenu)
-            {
-                var origSkin = GUI.skin;
-
-                GUI.skin = UIStyles.WindowSkin;
-                m_rect = GUI.Window(windowID, m_rect, (GUI.WindowFunction)WindowFunction, Title);
-
-                GUI.skin = origSkin;
-            }
+            m_rect = GUI.Window(windowID, m_rect, (GUI.WindowFunction)WindowFunction, Title);
         }
 
         public void Header()

src/Menu/Windows/WindowManager.cs

@@ -8,7 +8,6 @@ using UnhollowerBaseLib;
 using UnhollowerRuntimeLib;
 using UnityEngine;
 using UnityEngine.Events;
-using UnityEngine.EventSystems;
 
 namespace Explorer
 {

src/Tests/TestClass.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MelonLoader;
+using UnityEngine;
+
+namespace Explorer.Tests
+{
+    public class TestClass
+    {
+        public static TestClass Instance => m_instance ?? (m_instance = new TestClass());
+        private static TestClass m_instance;
+
+        public TestClass()
+        {
+            ILHashSetTest = new Il2CppSystem.Collections.Generic.HashSet<string>();
+            ILHashSetTest.Add("1");
+            ILHashSetTest.Add("2");
+            ILHashSetTest.Add("3");
+        }
+
+        // test HashSets
+
+        public static HashSet<string> HashSetTest = new HashSet<string>
+        {
+            "One",
+            "Two",
+            "Three"
+        };
+
+        public static Il2CppSystem.Collections.Generic.HashSet<string> ILHashSetTest;
+
+        // Test indexed parameter
+
+        public string this[int arg0, string arg1]
+        {
+            get
+            {
+                return $"arg0: {arg0}, arg1: {arg1}";
+            }
+        }
+
+        // Test basic list
+
+        public static List<string> TestList = new List<string>
+        {
+            "1",
+            "2",
+            "3",
+            "etc..."
+        };
+
+        // Test a nested dictionary
+
+        public static Dictionary<int, Dictionary<string, int>> NestedDictionary = new Dictionary<int, Dictionary<string, int>>
+        {
+            {
+                1,
+                new  Dictionary<string, int>
+                {
+                    {
+                        "Sub 1", 123
+                    },
+                    {
+                        "Sub 2", 456
+                    },
+                }
+            },
+            {
+                2,
+                new  Dictionary<string, int>
+                {
+                    {
+                        "Sub 3", 789
+                    },
+                    {
+                        "Sub 4", 000
+                    },
+                }
+            },
+        };
+
+        // Test a basic method
+
+        public static Color TestMethod(float r, float g, float b, float a)
+        {
+            return new Color(r, g, b, a);
+        }
+
+        // A method with default arguments
+
+        public static Vector3 TestDefaultArgs(float arg0, float arg1, float arg2 = 5.0f)
+        {
+            return new Vector3(arg0, arg1, arg2);
+        }
+    }
+}

src/UnstripFixes/GUIUnstrip.cs

@@ -20,45 +20,328 @@ namespace Explorer
         public static bool ScrollFailed = false;
         public static bool ManualUnstripFailed = false;
 
-        private static GenericStack ScrollStack
-        {
-            get
-            {
-                if (m_scrollViewStatesInfo == null)
-                {
-                    try
-                    {
-                        m_scrollViewStatesInfo = typeof(GUI).GetProperty("scrollViewStates");
-                        if (m_scrollViewStatesInfo == null) throw new Exception();
-                    }
-                    catch
-                    {
-                        m_scrollViewStatesInfo = typeof(GUI).GetProperty("s_scrollViewStates");
-                    }
-                }
-
-                return (GenericStack)m_scrollViewStatesInfo?.GetValue(null, null);
-            }
-        }
+        private static GenericStack ScrollStack => m_scrollStack ?? GetScrollStack();
         private static PropertyInfo m_scrollViewStatesInfo;
-        
+        private static GenericStack m_scrollStack;
 
-        public static Rect GetLastRect()
+        public static DateTime nextScrollStepTime;
+
+        private static GenericStack GetScrollStack()
         {
-            EventType type = Event.current.type;
-            Rect last;
-            if (type != EventType.Layout && type != EventType.Used)
+            if (m_scrollViewStatesInfo == null)
             {
-                last = GUILayoutUtility.current.topLevel.GetLastUnstripped();
+                if (typeof(GUI).GetProperty("scrollViewStates", ReflectionHelpers.CommonFlags) is PropertyInfo scrollStatesInfo)
+                {
+                    m_scrollViewStatesInfo = scrollStatesInfo;
+                }
+                else if (typeof(GUI).GetProperty("s_ScrollViewStates", ReflectionHelpers.CommonFlags) is PropertyInfo s_scrollStatesInfo)
+                {
+                    m_scrollViewStatesInfo = s_scrollStatesInfo;
+                }
+            }
+
+            if (m_scrollViewStatesInfo?.GetValue(null, null) is GenericStack stack)
+            {
+                m_scrollStack = stack;
             }
             else
             {
-                last = GUILayoutUtility.kDummyRect;
+                m_scrollStack = new GenericStack();
             }
-            return last;
+
+            return m_scrollStack;
         }
 
-        // Fix for BeginScrollView.
+        // ======== Fix for GUIUtility.ScreenToGuiPoint ========
+
+        public static Vector2 ScreenToGUIPoint(Vector2 screenPoint)
+        {
+            return GUIClip.ClipToWindow(InternalScreenToWindowPoint(screenPoint));
+        }
+
+        private static Vector2 InternalScreenToWindowPoint(Vector2 screenPoint)
+        {
+            GUIUtility.InternalScreenToWindowPoint_Injected(ref screenPoint, out Vector2 result);
+            return result;
+        }
+
+        // ================= Fix for Space =================
+
+        public static void Space(float pixels)
+        {
+            GUIUtility.CheckOnGUI();
+
+            if (GUILayoutUtility.current.topLevel.isVertical)
+                LayoutUtilityUnstrip.GetRect(0, pixels, GUILayoutUtility.spaceStyle, new GUILayoutOption[] { GUILayout.Height(pixels) });
+            else
+                LayoutUtilityUnstrip.GetRect(pixels, 0, GUILayoutUtility.spaceStyle, new GUILayoutOption[] { GUILayout.Width(pixels) });
+
+            if (Event.current.type == EventType.Layout)
+            {
+                GUILayoutUtility.current.topLevel.entries[GUILayoutUtility.current.topLevel.entries.Count - 1].consideredForMargin = false;
+            }
+        }
+
+        // ================= Fix for BeginArea =================
+
+        static public void BeginArea(Rect screenRect) { BeginArea(screenRect, GUIContent.none, GUIStyle.none); }
+        static public void BeginArea(Rect screenRect, string text) { BeginArea(screenRect, GUIContent.Temp(text), GUIStyle.none); }
+        static public void BeginArea(Rect screenRect, Texture image) { BeginArea(screenRect, GUIContent.Temp(image), GUIStyle.none); }
+        static public void BeginArea(Rect screenRect, GUIContent content) { BeginArea(screenRect, content, GUIStyle.none); }
+        static public void BeginArea(Rect screenRect, GUIStyle style) { BeginArea(screenRect, GUIContent.none, style); }
+        static public void BeginArea(Rect screenRect, string text, GUIStyle style) { BeginArea(screenRect, GUIContent.Temp(text), style); }
+        static public void BeginArea(Rect screenRect, Texture image, GUIStyle style) { BeginArea(screenRect, GUIContent.Temp(image), style); }
+
+        static public void BeginArea(Rect screenRect, GUIContent content, GUIStyle style)
+        {
+            GUILayoutGroup g = GUILayoutUtility.BeginLayoutArea(style, Il2CppType.Of<GUILayoutGroup>());
+            if (Event.current.type == EventType.Layout)
+            {
+                g.resetCoords = true;
+                g.minWidth = g.maxWidth = screenRect.width;
+                g.minHeight = g.maxHeight = screenRect.height;
+                g.rect = Rect.MinMaxRect(screenRect.xMin, screenRect.yMin, g.rect.xMax, g.rect.yMax);
+            }
+
+            GUI.BeginGroup(g.rect, content, style);
+        }
+
+        static public void EndArea()
+        {
+            if (Event.current.type == EventType.Used)
+                return;
+            GUILayoutUtility.current.layoutGroups.Pop();
+            GUILayoutUtility.current.topLevel = GUILayoutUtility.current.layoutGroups.Peek().TryCast<GUILayoutGroup>();
+            GUI.EndGroup();
+        }
+
+        // ================= Fix for BeginGroup =================
+
+        public static void BeginGroup(Rect position) { BeginGroup(position, GUIContent.none, GUIStyle.none); }
+        public static void BeginGroup(Rect position, string text) { BeginGroup(position, GUIContent.Temp(text), GUIStyle.none); }
+        public static void BeginGroup(Rect position, Texture image) { BeginGroup(position, GUIContent.Temp(image), GUIStyle.none); }
+        public static void BeginGroup(Rect position, GUIContent content) { BeginGroup(position, content, GUIStyle.none); }
+        public static void BeginGroup(Rect position, GUIStyle style) { BeginGroup(position, GUIContent.none, style); }
+        public static void BeginGroup(Rect position, string text, GUIStyle style) { BeginGroup(position, GUIContent.Temp(text), style); }
+        public static void BeginGroup(Rect position, Texture image, GUIStyle style) { BeginGroup(position, GUIContent.Temp(image), style); }
+
+        public static void BeginGroup(Rect position, GUIContent content, GUIStyle style) { BeginGroup(position, content, style, Vector2.zero); }
+
+        internal static void BeginGroup(Rect position, GUIContent content, GUIStyle style, Vector2 scrollOffset)
+        {
+            int id = GUIUtility.GetControlID(GUI.s_BeginGroupHash, FocusType.Passive);
+
+            if (content != GUIContent.none || style != GUIStyle.none)
+            {
+                switch (Event.current.type)
+                {
+                    case EventType.Repaint:
+                        style.Draw(position, content, id);
+                        break;
+                    default:
+                        if (position.Contains(Event.current.mousePosition))
+                            GUIUtility.mouseUsed = true;
+                        break;
+                }
+            }
+            GUIClip.Push(position, scrollOffset, Vector2.zero, false);
+        }
+
+        public static void EndGroup()
+        {
+            GUIClip.Internal_Pop();
+        }
+
+        // ================= Fix for BeginVertical =================
+
+        public static void BeginVertical(params GUILayoutOption[] options) { BeginVertical(GUIContent.none, GUIStyle.none, options); }
+        public static void BeginVertical(GUIStyle style, params GUILayoutOption[] options) { BeginVertical(GUIContent.none, style, options); }
+        public static void BeginVertical(string text, GUIStyle style, params GUILayoutOption[] options) { BeginVertical(GUIContent.Temp(text), style, options); }
+        public static void BeginVertical(Texture image, GUIStyle style, params GUILayoutOption[] options) { BeginVertical(GUIContent.Temp(image), style, options); }
+
+        public static void BeginVertical(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+        {
+            var g = GUILayoutUtility.BeginLayoutGroup(style, options, Il2CppType.Of<GUILayoutGroup>());
+            g.isVertical = true;
+            if (style != GUIStyle.none || content != GUIContent.none)
+                GUI.Box(g.rect, content, style);
+        }
+
+        public static void EndVertical()
+        {
+            GUILayoutUtility.EndLayoutGroup();
+        }
+
+        // ================= Fix for BeginHorizontal ==================
+
+        public static void BeginHorizontal(params GUILayoutOption[] options) { BeginHorizontal(GUIContent.none, GUIStyle.none, options); }
+        public static void BeginHorizontal(GUIStyle style, params GUILayoutOption[] options) { BeginHorizontal(GUIContent.none, style, options); }
+        public static void BeginHorizontal(string text, GUIStyle style, params GUILayoutOption[] options) { BeginHorizontal(GUIContent.Temp(text), style, options); }
+
+        public static void BeginHorizontal(Texture image, GUIStyle style, params GUILayoutOption[] options)
+        { BeginHorizontal(GUIContent.Temp(image), style, options); }
+        public static void BeginHorizontal(GUIContent content, GUIStyle style, params GUILayoutOption[] options)
+        {
+            GUILayoutGroup g = GUILayoutUtility.BeginLayoutGroup(style, options, Il2CppType.Of<GUILayoutGroup>());
+            g.isVertical = false;
+            if (style != GUIStyle.none || content != GUIContent.none)
+                GUI.Box(g.rect, content, style);
+        }
+
+        public static void EndHorizontal()
+        {
+            GUILayoutUtility.EndLayoutGroup();
+        }
+
+        // =========== Fix for GUI elements =============
+
+        static public void Label(Texture image, params GUILayoutOption[] options) { DoLabel(GUIContent.Temp(image), GUI.skin.label, options); }
+        static public void Label(string text, params GUILayoutOption[] options) { DoLabel(GUIContent.Temp(text), GUI.skin.label, options); }
+        static public void Label(GUIContent content, params GUILayoutOption[] options) { DoLabel(content, GUI.skin.label, options); }
+        static public void Label(Texture image, GUIStyle style, params GUILayoutOption[] options) { DoLabel(GUIContent.Temp(image), style, options); }
+        static public void Label(string text, GUIStyle style, params GUILayoutOption[] options) { DoLabel(GUIContent.Temp(text), style, options); }
+        // Make an auto-layout label.
+        static public void Label(GUIContent content, GUIStyle style, params GUILayoutOption[] options) { DoLabel(content, style, options); }
+        static void DoLabel(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        { GUI.Label(LayoutUtilityUnstrip.GetRect(content, style, options), content, style); }
+
+        static public void Box(Texture image, params GUILayoutOption[] options) { DoBox(GUIContent.Temp(image), GUI.skin.box, options); }
+        static public void Box(string text, params GUILayoutOption[] options) { DoBox(GUIContent.Temp(text), GUI.skin.box, options); }
+        static public void Box(GUIContent content, params GUILayoutOption[] options) { DoBox(content, GUI.skin.box, options); }
+        static public void Box(Texture image, GUIStyle style, params GUILayoutOption[] options) { DoBox(GUIContent.Temp(image), style, options); }
+        static public void Box(string text, GUIStyle style, params GUILayoutOption[] options) { DoBox(GUIContent.Temp(text), style, options); }
+        // Make an auto-layout box.
+        static public void Box(GUIContent content, GUIStyle style, params GUILayoutOption[] options) { DoBox(content, style, options); }
+        static void DoBox(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        { GUI.Box(LayoutUtilityUnstrip.GetRect(content, style, options), content, style); }
+
+        static public bool Button(Texture image, params GUILayoutOption[] options) { return DoButton(GUIContent.Temp(image), GUI.skin.button, options); }
+        static public bool Button(string text, params GUILayoutOption[] options) { return DoButton(GUIContent.Temp(text), GUI.skin.button, options); }
+        static public bool Button(GUIContent content, params GUILayoutOption[] options) { return DoButton(content, GUI.skin.button, options); }
+        static public bool Button(Texture image, GUIStyle style, params GUILayoutOption[] options) { return DoButton(GUIContent.Temp(image), style, options); }
+        static public bool Button(string text, GUIStyle style, params GUILayoutOption[] options) { return DoButton(GUIContent.Temp(text), style, options); }
+        // Make a single press button. The user clicks them and something happens immediately.
+        static public bool Button(GUIContent content, GUIStyle style, params GUILayoutOption[] options) { return DoButton(content, style, options); }
+        static bool DoButton(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        { return GUI.Button(LayoutUtilityUnstrip.GetRect(content, style, options), content, style); }
+
+        static public bool RepeatButton(Texture image, params GUILayoutOption[] options) { return DoRepeatButton(GUIContent.Temp(image), GUI.skin.button, options); }
+        static public bool RepeatButton(string text, params GUILayoutOption[] options) { return DoRepeatButton(GUIContent.Temp(text), GUI.skin.button, options); }
+        static public bool RepeatButton(GUIContent content, params GUILayoutOption[] options) { return DoRepeatButton(content, GUI.skin.button, options); }
+        static public bool RepeatButton(Texture image, GUIStyle style, params GUILayoutOption[] options) { return DoRepeatButton(GUIContent.Temp(image), style, options); }
+        static public bool RepeatButton(string text, GUIStyle style, params GUILayoutOption[] options) { return DoRepeatButton(GUIContent.Temp(text), style, options); }
+        // Make a repeating button. The button returns true as long as the user holds down the mouse
+        static public bool RepeatButton(GUIContent content, GUIStyle style, params GUILayoutOption[] options) { return DoRepeatButton(content, style, options); }
+        static bool DoRepeatButton(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        { return RepeatButton(LayoutUtilityUnstrip.GetRect(content, style, options), content, style); }
+
+        public static string TextField(string text, params GUILayoutOption[] options) { return DoTextField(text, -1, false, GUI.skin.textField, options); }
+        public static string TextField(string text, int maxLength, params GUILayoutOption[] options) { return DoTextField(text, maxLength, false, GUI.skin.textField, options); }
+        public static string TextField(string text, GUIStyle style, params GUILayoutOption[] options) { return DoTextField(text, -1, false, style, options); }
+        // Make a single-line text field where the user can edit a string.
+        public static string TextField(string text, int maxLength, GUIStyle style, params GUILayoutOption[] options) { return DoTextField(text, maxLength, false, style, options); }
+
+        public static string TextArea(string text, params GUILayoutOption[] options) { return DoTextField(text, -1, true, GUI.skin.textArea, options); }
+        public static string TextArea(string text, int maxLength, params GUILayoutOption[] options) { return DoTextField(text, maxLength, true, GUI.skin.textArea, options); }
+        public static string TextArea(string text, GUIStyle style, params GUILayoutOption[] options) { return DoTextField(text, -1, true, style, options); }
+        // Make a multi-line text field where the user can edit a string.
+        public static string TextArea(string text, int maxLength, GUIStyle style, params GUILayoutOption[] options) { return DoTextField(text, maxLength, true, style, options); }
+
+        static string DoTextField(string text, int maxLength, bool multiline, GUIStyle style, GUILayoutOption[] options)
+        {
+            int id = GUIUtility.GetControlID(FocusType.Keyboard);
+            GUIContent content;
+            Rect r;
+            if (GUIUtility.keyboardControl != id)
+                content = GUIContent.Temp(text);
+            else
+                content = GUIContent.Temp(text + GUIUtility.compositionString);
+
+            r = LayoutUtilityUnstrip.GetRect(content, style, options);
+            if (GUIUtility.keyboardControl == id)
+                content = GUIContent.Temp(text);
+            GUI.DoTextField(r, id, content, multiline, maxLength, style);
+            return content.text;
+        }
+
+        static public bool Toggle(bool value, Texture image, params GUILayoutOption[] options) { return DoToggle(value, GUIContent.Temp(image), GUI.skin.toggle, options); }
+        static public bool Toggle(bool value, string text, params GUILayoutOption[] options) { return DoToggle(value, GUIContent.Temp(text), GUI.skin.toggle, options); }
+        static public bool Toggle(bool value, GUIContent content, params GUILayoutOption[] options) { return DoToggle(value, content, GUI.skin.toggle, options); }
+        static public bool Toggle(bool value, Texture image, GUIStyle style, params GUILayoutOption[] options) { return DoToggle(value, GUIContent.Temp(image), style, options); }
+        static public bool Toggle(bool value, string text, GUIStyle style, params GUILayoutOption[] options) { return DoToggle(value, GUIContent.Temp(text), style, options); }
+        // Make an on/off toggle button.
+        static public bool Toggle(bool value, GUIContent content, GUIStyle style, params GUILayoutOption[] options) { return DoToggle(value, content, style, options); }
+
+        static bool DoToggle(bool value, GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        { return GUI.Toggle(LayoutUtilityUnstrip.GetRect(content, style, options), value, content, style); }
+
+        // =========== Fix for GUI.RepeatButton (not GUILayout) ===========
+
+        public static bool RepeatButton(Rect position, string text)
+        {
+            return DoRepeatButton(position, GUIContent.Temp(text), GUI.s_Skin.button, FocusType.Passive);
+        }
+
+        public static bool RepeatButton(Rect position, Texture image)
+        {
+            return DoRepeatButton(position, GUIContent.Temp(image), GUI.s_Skin.button, FocusType.Passive);
+        }
+
+        public static bool RepeatButton(Rect position, GUIContent content)
+        {
+            return DoRepeatButton(position, content, GUI.s_Skin.button, FocusType.Passive);
+        }
+
+        public static bool RepeatButton(Rect position, string text, GUIStyle style)
+        {
+            return DoRepeatButton(position, GUIContent.Temp(text), style, FocusType.Passive);
+        }
+
+        public static bool RepeatButton(Rect position, Texture image, GUIStyle style)
+        {
+            return DoRepeatButton(position, GUIContent.Temp(image), style, FocusType.Passive);
+        }
+
+        public static bool RepeatButton(Rect position, GUIContent content, GUIStyle style)
+        {
+            return DoRepeatButton(position, content, style, FocusType.Passive);
+        }
+
+        private static bool DoRepeatButton(Rect position, GUIContent content, GUIStyle style, FocusType focusType)
+        {
+            int id = GUIUtility.GetControlID(GUI.s_RepeatButtonHash, focusType, position);
+            switch (Event.current.GetTypeForControl(id))
+            {
+                case EventType.MouseDown:
+                    // If the mouse is inside the button, we say that we're the hot control
+                    if (position.Contains(Event.current.mousePosition))
+                    {
+                        GUIUtility.hotControl = id;
+                        Event.current.Use();
+                    }
+                    return false;
+                case EventType.MouseUp:
+                    if (GUIUtility.hotControl == id)
+                    {
+                        GUIUtility.hotControl = 0;
+
+                        // If we got the mousedown, the mouseup is ours as well
+                        // (no matter if the click was in the button or not)
+                        Event.current.Use();
+
+                        // But we only return true if the button was actually clicked
+                        return position.Contains(Event.current.mousePosition);
+                    }
+                    return false;
+                case EventType.Repaint:
+                    style.Draw(position, content, id, false, position.Contains(Event.current.mousePosition));
+                    return id == GUIUtility.hotControl && position.Contains(Event.current.mousePosition);
+            }
+            return false;
+        }
+
+
+        // ================= Fix for BeginScrollView. =======================
 
         public static Vector2 BeginScrollView(Vector2 scroll, params GUILayoutOption[] options)
         {
@@ -67,7 +350,7 @@ namespace Explorer
             {
                 try
                 {
-                    return GUILayout.BeginScrollView(scroll, options);
+                    return GUIUnstrip.BeginScrollView(scroll, options);
                 }
                 catch
                 {
@@ -99,7 +382,7 @@ namespace Explorer
 
             if (!ScrollFailed)
             {
-                GUILayout.EndScrollView();
+                GUIUnstrip.EndScrollView();
             }
             else if (!ManualUnstripFailed)
             {
@@ -112,8 +395,6 @@ namespace Explorer
         private static Vector2 BeginScrollView_ImplLayout(Vector2 scrollPosition, bool alwaysShowHorizontal, bool alwaysShowVertical, 
             GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background, params GUILayoutOption[] options)
         {
-            GUIUtility.CheckOnGUI();
-
             var guiscrollGroup = GUILayoutUtility.BeginLayoutGroup(background, null, Il2CppType.Of<GUIScrollGroup>())
                                 .TryCast<GUIScrollGroup>();
 
@@ -145,7 +426,7 @@ namespace Explorer
         private static Vector2 BeginScrollView_Impl(Rect position, Vector2 scrollPosition, Rect viewRect, bool alwaysShowHorizontal, 
             bool alwaysShowVertical, GUIStyle horizontalScrollbar, GUIStyle verticalScrollbar, GUIStyle background)
         {
-            GUIUtility.CheckOnGUI();
+            // GUIUtility.CheckOnGUI();
 
             int controlID = GUIUtility.GetControlID(GUI.s_ScrollviewHash, FocusType.Passive);
 
@@ -388,12 +669,12 @@ namespace Explorer
                 if (flag)
                 {
                     result = true;
-                    GUI.nextScrollStepTime = Il2CppSystem.DateTime.Now.AddMilliseconds(250.0);
+                    nextScrollStepTime = DateTime.Now.AddMilliseconds(250.0);
                 }
-                else if (Il2CppSystem.DateTime.Now >= GUI.nextScrollStepTime)
+                else if (DateTime.Now >= nextScrollStepTime)
                 {
                     result = true;
-                    GUI.nextScrollStepTime = Il2CppSystem.DateTime.Now.AddMilliseconds(30.0);
+                    nextScrollStepTime = DateTime.Now.AddMilliseconds(30.0);
                 }
                 if (Event.current.type == EventType.Repaint)
                 {

src/UnstripFixes/LayoutUtilityUnstrip.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using UnityEngine;
+
+namespace Explorer
+{
+    public class LayoutUtilityUnstrip
+    {
+        public static Rect GetRect(float width, float height) { return DoGetRect(width, width, height, height, GUIStyle.none, null); }
+        public static Rect GetRect(float width, float height, GUIStyle style) { return DoGetRect(width, width, height, height, style, null); }
+        public static Rect GetRect(float width, float height, params GUILayoutOption[] options) { return DoGetRect(width, width, height, height, GUIStyle.none, options); }
+        // Reserve layout space for a rectangle with a fixed content area.
+        public static Rect GetRect(float width, float height, GUIStyle style, params GUILayoutOption[] options)
+        { return DoGetRect(width, width, height, height, style, options); }
+
+        public static Rect GetRect(float minWidth, float maxWidth, float minHeight, float maxHeight)
+        { return DoGetRect(minWidth, maxWidth, minHeight, maxHeight, GUIStyle.none, null); }
+
+        public static Rect GetRect(float minWidth, float maxWidth, float minHeight, float maxHeight, GUIStyle style)
+        { return DoGetRect(minWidth, maxWidth, minHeight, maxHeight, style, null); }
+
+        public static Rect GetRect(float minWidth, float maxWidth, float minHeight, float maxHeight, params GUILayoutOption[] options)
+        { return DoGetRect(minWidth, maxWidth, minHeight, maxHeight, GUIStyle.none, options); }
+        // Reserve layout space for a flexible rect.
+        public static Rect GetRect(float minWidth, float maxWidth, float minHeight, float maxHeight, GUIStyle style, params GUILayoutOption[] options)
+        { return DoGetRect(minWidth, maxWidth, minHeight, maxHeight, style, options); }
+        static Rect DoGetRect(float minWidth, float maxWidth, float minHeight, float maxHeight, GUIStyle style, GUILayoutOption[] options)
+        {
+            switch (Event.current.type)
+            {
+                case EventType.Layout:
+                    GUILayoutUtility.current.topLevel.Add(new GUILayoutEntry(minWidth, maxWidth, minHeight, maxHeight, style, options));
+                    return GUILayoutUtility.kDummyRect;
+                case EventType.Used:
+                    return GUILayoutUtility.kDummyRect;
+                default:
+                    return GUILayoutUtility.current.topLevel.GetNext().rect;
+            }
+        }
+        public static Rect GetRect(GUIContent content, GUIStyle style) { return DoGetRect(content, style, null); }
+        // Reserve layout space for a rectangle for displaying some contents with a specific style.
+        public static Rect GetRect(GUIContent content, GUIStyle style, params GUILayoutOption[] options) { return DoGetRect(content, style, options); }
+
+        static Rect DoGetRect(GUIContent content, GUIStyle style, GUILayoutOption[] options)
+        {
+            GUIUtility.CheckOnGUI();
+
+            switch (Event.current.type)
+            {
+                case EventType.Layout:
+                    if (style.isHeightDependantOnWidth)
+                    {
+                        GUILayoutUtility.current.topLevel.Add(new GUIWordWrapSizer(style, content, options));
+                    }
+                    else
+                    {
+                        Vector2 sizeConstraints = new Vector2(0, 0);
+                        if (options != null)
+                        {
+                            foreach (var option in options)
+                            {
+                                if (float.TryParse(option.value.ToString(), out float f))
+                                {
+                                    switch (option.type)
+                                    {
+                                        case GUILayoutOption.Type.maxHeight:
+                                            sizeConstraints.y = f;
+                                            break;
+                                        case GUILayoutOption.Type.maxWidth:
+                                            sizeConstraints.x = f;
+                                            break;
+                                    }
+                                }
+                            }
+                        }
+
+                        Vector2 size = style.CalcSizeWithConstraints(content, sizeConstraints);
+                        // This is needed on non-integer scale ratios to avoid errors to accumulate in further layout calculations
+                        size.x = Mathf.Ceil(size.x);
+                        size.y = Mathf.Ceil(size.y);
+                        GUILayoutUtility.current.topLevel.Add(new GUILayoutEntry(size.x, size.x, size.y, size.y, style, options));
+                    }
+                    return GUILayoutUtility.kDummyRect;
+
+                case EventType.Used:
+                    return GUILayoutUtility.kDummyRect;
+                default:
+                    var entry = GUILayoutUtility.current.topLevel.GetNext();
+                    //GUIDebugger.LogLayoutEntry(entry.rect, entry.marginLeft, entry.marginRight, entry.marginTop, entry.marginBottom, entry.style);
+                    return entry.rect;
+            }
+        }
+
+        public static Rect GetLastRect()
+        {
+            EventType type = Event.current.type;
+            Rect last;
+            if (type != EventType.Layout && type != EventType.Used)
+            {
+                last = GUILayoutUtility.current.topLevel.GetLastUnstripped();
+            }
+            else
+            {
+                last = GUILayoutUtility.kDummyRect;
+            }
+            return last;
+        }
+    }
+}

src/UnstripFixes/SliderHandlerUnstrip.cs

@@ -81,7 +81,7 @@ namespace Explorer
 					if (this.SupportsPageMovements())
 					{
 						this.SliderState().isDragging = false;
-						GUI.nextScrollStepTime = SystemClock.now.AddMilliseconds(250.0);
+						GUIUnstrip.nextScrollStepTime = DateTime.Now.AddMilliseconds(250.0);
 						GUI.scrollTroughSide = this.CurrentScrollTroughSide();
 						result = this.PageMovementValue();
 					}
@@ -155,7 +155,7 @@ namespace Explorer
 			else
 			{
 				GUI.InternalRepaintEditorWindow();
-				if (SystemClock.now < GUI.nextScrollStepTime)
+				if (DateTime.Now < GUIUnstrip.nextScrollStepTime)
 				{
 					result = this.currentValue;
 				}
@@ -165,7 +165,7 @@ namespace Explorer
 				}
 				else
 				{
-					GUI.nextScrollStepTime = SystemClock.now.AddMilliseconds(30.0);
+					GUIUnstrip.nextScrollStepTime = DateTime.Now.AddMilliseconds(30.0);
 					if (this.SupportsPageMovements())
 					{
 						this.SliderState().isDragging = false;