Update ExplorerCore.cs

This reverts commit 4280a071f6.

src/CacheObject/CacheMember.cs

@@ -128,8 +128,8 @@ namespace Explorer.CacheObject
                 GUI.skin.label.alignment = TextAnchor.MiddleCenter;
 
                 GUILayout.Label(i.ToString(), new GUILayoutOption[] { GUILayout.Width(15) });
-                GUILayout.Label(label, new GUILayoutOption[] { GUILayout.ExpandWidth(false) });
-                this.m_argumentInput[i] = GUIHelper.TextField(input, new GUILayoutOption[] { GUILayout.ExpandWidth(true) });
+                GUILayout.Label(label, new GUILayoutOption[] { GUIHelper.ExpandWidth(false) });
+                this.m_argumentInput[i] = GUIHelper.TextField(input, new GUILayoutOption[] { GUIHelper.ExpandWidth(true) });
 
                 GUI.skin.label.alignment = TextAnchor.MiddleLeft;
 

src/ExplorerCore.cs

@@ -12,7 +12,7 @@ namespace Explorer
     public class ExplorerCore
     {
         public const string NAME    = "Explorer " + VERSION + " (" + PLATFORM + ", " + MODLOADER + ")";
-        public const string VERSION = "2.0.7";
+        public const string VERSION = "2.0.8";
         public const string AUTHOR  = "Sinai";
         public const string GUID    = "com.sinai.explorer";
 

src/UI/ForceUnlockCursor.cs

@@ -1,6 +1,7 @@
 using System;
 using UnityEngine;
 using Explorer.Helpers;
+using BF = System.Reflection.BindingFlags;
 #if ML
 using Harmony;
 #else
@@ -40,8 +41,17 @@ namespace Explorer.UI
                 }
 
                 // Get current cursor state and enable cursor
-                m_lastLockMode = Cursor.lockState;
-                m_lastVisibleState = Cursor.visible;
+                try
+                {
+                    //m_lastLockMode = Cursor.lockState;
+                    m_lastLockMode = (CursorLockMode?)typeof(Cursor).GetProperty("lockState", BF.Public | BF.Static)?.GetValue(null, null)
+                                     ?? CursorLockMode.None;
+
+                    //m_lastVisibleState = Cursor.visible;
+                    m_lastVisibleState = (bool?)typeof(Cursor).GetProperty("visible", BF.Public | BF.Static)?.GetValue(null, null) 
+                                         ?? false;
+                }
+                catch { }
 
                 // Setup Harmony Patches
                 TryPatch("lockState", new HarmonyMethod(typeof(ForceUnlockCursor).GetMethod(nameof(Prefix_set_lockState))), true);

src/UI/Inspectors/ReflectionInspector.cs

@@ -99,20 +99,20 @@ namespace Explorer.UI.Inspectors
             if (m_typeFilter != MemberTypes.All && m_typeFilter != holder.MemInfo?.MemberType)
                 return false;
 
-            // check scope filter
-            if (m_scopeFilter == MemberScopes.Instance)
-            {
-                return !holder.IsStatic;
-            }
-            else if (m_scopeFilter == MemberScopes.Static)
-            {
-                return holder.IsStatic;
-            }
-
             // hide failed reflection
             if (!string.IsNullOrEmpty(holder.ReflectionException) && m_hideFailedReflection)
                 return false;
 
+            // check scope filter
+            if (m_scopeFilter == MemberScopes.Instance && holder.IsStatic)
+            {
+                return false;
+            }
+            else if (m_scopeFilter == MemberScopes.Static && !holder.IsStatic)
+            {
+                return false;
+            }
+
             // see if we should do name search
             if (m_search == "" || holder.MemInfo == null)
                 return true;
@@ -141,22 +141,6 @@ namespace Explorer.UI.Inspectors
                     continue;
                 }
 
-                object target = Target;
-                string exception = null;
-
-#if CPP
-                if (!IsStaticInspector && target is Il2CppSystem.Object ilObject)
-                {
-                    try
-                    {
-                        target = ilObject.Il2CppCast(declaringType);
-                    }
-                    catch (Exception e)
-                    {
-                        exception = ReflectionHelpers.ExceptionToString(e);
-                    }
-                }
-#endif
                 foreach (var member in infos)
                 {
                     try
@@ -211,17 +195,12 @@ namespace Explorer.UI.Inspectors
 
                         try
                         {
-                            var cached = CacheFactory.GetCacheObject(member, target);
+                            var cached = CacheFactory.GetCacheObject(member, Target);
 
                             if (cached != null)
                             {
                                 cachedSigs.Add(sig);
                                 list.Add(cached);
-
-                                if (string.IsNullOrEmpty(cached.ReflectionException))
-                                {
-                                    cached.ReflectionException = exception;
-                                }
                             }
                         }
                         catch (Exception e)

src/UI/InteractiveValue/InteractiveValue.cs

@@ -224,6 +224,11 @@ namespace Explorer.UI
             {
                 label = (string)ToStringMethod?.Invoke(Value, null) ?? Value.ToString();
 
+                if (label.Length > 100)
+                {
+                    label = label.Substring(0, 99);
+                }
+
                 var classColor = valueType.IsAbstract && valueType.IsSealed
                     ? Syntax.Class_Static
                     : Syntax.Class_Instance;

src/UI/InteractiveValue/Struct/InteractivePrimitive.cs

@@ -104,7 +104,7 @@ namespace Explorer.UI
 
             GUILayout.Label("<color=#2df7b2><i>" + ValueType.Name + "</i></color>", new GUILayoutOption[] { GUILayout.Width(50) });
 
-            m_valueToString = GUIHelper.TextArea(m_valueToString, new GUILayoutOption[] { GUILayout.ExpandWidth(true) });
+            m_valueToString = GUIHelper.TextArea(m_valueToString, new GUILayoutOption[] { GUIHelper.ExpandWidth(true) });
 
             DrawApplyButton();
 

src/UI/Shared/PageHelper.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 namespace Explorer.UI.Shared
 {
@@ -38,7 +39,7 @@ namespace Explorer.UI.Shared
 
         private int CalculateMaxOffset()
         {
-            return MaxPageOffset = (int)Mathf.Ceil((float)(ItemCount / (decimal)ItemsPerPage)) - 1;
+            return MaxPageOffset = (int)Math.Ceiling((float)(ItemCount / (decimal)ItemsPerPage)) - 1;
         }
 
         public void CurrentPageLabel()

src/UI/WindowBase.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using Explorer.Config;
 using Explorer.UI.Inspectors;
+using Explorer.Helpers;
 
 namespace Explorer.UI
 {
@@ -26,7 +27,15 @@ namespace Explorer.UI
         {
             var window = Activator.CreateInstance<T>();
 
+#if CPP
+            if (target is Il2CppSystem.Object ilObject)
+            {
+                target = ilObject.Il2CppCast(ReflectionHelpers.GetActualType(ilObject));
+            }
+#endif
+
             window.Target = target;
+
             window.windowID = WindowManager.NextWindowID();
             window.m_rect = WindowManager.GetNewWindowRect();
 

src/Unstrip/IMGUI/GUIHelper.cs

@@ -13,6 +13,14 @@ namespace Explorer
 
     public class GUIHelper
     {
+        internal static GUILayoutOption ExpandWidth(bool expand)
+        {
+#if CPP
+            return GUIUnstrip.ExpandWidth(expand);
+#else
+            return GUIHelper.ExpandWidth(expand);
+#endif
+        }
 
         internal static GUILayoutOption ExpandHeight(bool expand)
         {

src/Unstrip/IMGUI/GUIUnstrip.cs

@@ -8,9 +8,6 @@ using UnhollowerRuntimeLib;
 
 namespace Explorer.Unstrip.IMGUI
 {
-     // Also contains some stuff from GUI.
-     // This class was meant to be temporary but who knows.
-
     public class GUIUnstrip
     {
         #region Properties
@@ -93,12 +90,41 @@ namespace Explorer.Unstrip.IMGUI
 
         public static void BeginLayoutDirection(bool vertical, GUIContent content, GUIStyle style, GUILayoutOption[] options)
         {
-            var g = GUILayoutUtility.BeginLayoutGroup(style, options, Il2CppType.Of<GUILayoutGroup>());
+            var g = BeginLayoutGroup(style, options, Il2CppType.Of<GUILayoutGroup>());
             g.isVertical = vertical;
             if (style != GUIStyle.none || content != GUIContent.none)
                 GUI.Box(g.rect, content, style);
         }
 
+        public static GUILayoutGroup BeginLayoutGroup(GUIStyle style, GUILayoutOption[] options, Il2CppSystem.Type layoutType)
+        {
+            EventType type = Event.current.type;
+            GUILayoutGroup guilayoutGroup;
+            if (type != EventType.Used && type != EventType.Layout)
+            {
+                guilayoutGroup = GUILayoutUtility.current.topLevel.GetNext().TryCast<GUILayoutGroup>();
+
+                if (guilayoutGroup == null)
+                {
+                    throw new ArgumentException("GUILayout: Mismatched LayoutGroup." + Event.current.type);
+                }
+                guilayoutGroup.ResetCursor();
+            }
+            else
+            {
+                guilayoutGroup = GUILayoutUtility.CreateGUILayoutGroupInstanceOfType(layoutType);
+                guilayoutGroup.style = style;
+                if (options != null)
+                {
+                    guilayoutGroup.ApplyOptions(options);
+                }
+                GUILayoutUtility.current.topLevel.entries.Add(guilayoutGroup);
+            }
+            GUILayoutUtility.current.layoutGroups.Push(guilayoutGroup);
+            GUILayoutUtility.current.topLevel = guilayoutGroup;
+            return guilayoutGroup;
+        }
+
         public static string TextField(string text, GUILayoutOption[] options, bool multiLine)
         {
             text = text ?? string.Empty;
@@ -347,7 +373,7 @@ namespace Explorer.Unstrip.IMGUI
             {
                 guilayoutGroup = (GUILayoutGroup)Activator.CreateInstance(layoutType);
                 guilayoutGroup.style = style;
-                GUILayoutUtility.current.windows.Add(guilayoutGroup);
+                GUILayoutUtility.current.windows.entries.Add(guilayoutGroup);
             }
             GUILayoutUtility.current.layoutGroups.Push(guilayoutGroup);
             GUILayoutUtility.current.topLevel = guilayoutGroup;