Misc cleanups and adjustments

Author: sinai-dev

src/Core/Reflection/Il2CppReflection.cs

@@ -745,7 +745,7 @@ internal bool DoLoadModule(string fullPath)
         ////    var valueType = value.GetActualType();
         ////
         ////    Type typeOfKeys, typeOfValues;
-        ////    if (valueType.IsGenericType && valueType.GetGenericArguments() is var args && args.Length == 2)
+        ////    if (valueType.IsGenericType && valueType.GetGenericArguments() is ParameterInfo[] args && args.Length == 2)
         ////    {
         ////        typeOfKeys = args[0];
         ////        typeOfValues = args[1];

src/Core/Tests/TestClass.cs

@@ -194,6 +194,8 @@ private static object GetRandomObject()
 
 #if CPP
 
+        public static Il2CppSystem.Collections.IList AAAAAAACppList;
+
         public static string testStringOne = "Test";
         public static Il2CppSystem.Object testStringTwo = "string boxed as cpp object";
         public static Il2CppSystem.String testStringThree = "string boxed as cpp string";
@@ -237,6 +239,11 @@ static TestClass()
                 BigList.Add(i.ToString());
 
 #if CPP
+            var list = new Il2CppSystem.Collections.Generic.List<Il2CppSystem.Object>(5);
+            list.Add("one");
+            list.Add("two");
+            AAAAAAACppList = list.TryCast<Il2CppSystem.Collections.IList>();
+
             CppBoxedDict = new Dictionary<Il2CppSystem.String, Il2CppSystem.Object>();
             CppBoxedDict.Add("1", new Il2CppSystem.Int32 { m_value = 1 }.BoxIl2CppObject());
             CppBoxedDict.Add("2", new Il2CppSystem.Int32 { m_value = 2 }.BoxIl2CppObject());

src/ExplorerCore.cs

@@ -82,6 +82,7 @@ private static IEnumerator SetupCoroutine()
             Log($"{NAME} {VERSION} initialized.");
 
             //InspectorManager.Inspect(typeof(TestClass));
+            InspectorManager.Inspect(Camera.main.gameObject);
         }
 
         /// <summary>

src/UI/CSConsole/ConsoleController.cs

@@ -321,6 +321,7 @@ private static void UpdateCaret(out bool caretMoved)
         private static void SetCaretPosition(int caretPosition)
         {
             settingCaretCoroutine = true;
+            Input.Component.readOnly = true;
             RuntimeProvider.Instance.StartCoroutine(SetAutocompleteCaretCoro(caretPosition));
         }
 
@@ -343,6 +344,7 @@ private static IEnumerator SetAutocompleteCaretCoro(int caretPosition)
             color.a = defaultInputFieldAlpha;
             Input.Component.selectionColor = color;
 
+            Input.Component.readOnly = false;
             settingCaretCoroutine = false;
         }
 
@@ -575,7 +577,7 @@ public static void Main()
 
         internal const string HELP_COROUTINES = @"// To start a Coroutine directly, use ""Start(SomeCoroutine());"" in REPL mode.
 
-// To define a coroutine, you will need to compile it seperately. For example:
+// To declare a coroutine, you will need to compile it separately. For example:
 public class MyCoro
 {
     public static IEnumerator Main()

src/UI/CacheObject/Views/CacheListEntryCell.cs

@@ -13,8 +13,8 @@ public class CacheListEntryCell : CacheObjectCell
         public Image Image { get; private set; }
         public InteractiveList ListOwner => Occupant.Owner as InteractiveList;
 
-        public static Color EvenColor = new Color(0.07f, 0.07f, 0.07f);
-        public static Color OddColor = new Color(0.063f, 0.063f, 0.063f);
+        public static Color EvenColor = new Color(0.12f, 0.12f, 0.12f);
+        public static Color OddColor = new Color(0.1f, 0.1f, 0.1f);
 
         public override GameObject CreateContent(GameObject parent)
         {

src/UI/IValues/InteractiveValueStruct.cs

@@ -180,8 +180,8 @@ private void AddEditorRow()
 
             fieldRows.Add(row);
 
-            var label = UIFactory.CreateLabel(row, "Label", "notset", TextAnchor.MiddleRight);
-            UIFactory.SetLayoutElement(label.gameObject, minHeight: 25, minWidth: 175, flexibleWidth: 0);
+            var label = UIFactory.CreateLabel(row, "Label", "notset", TextAnchor.MiddleLeft);
+            UIFactory.SetLayoutElement(label.gameObject, minHeight: 25, minWidth: 50, flexibleWidth: 0);
             label.horizontalOverflow = HorizontalWrapMode.Wrap;
             labels.Add(label);
 

src/UI/Models/InputFieldRef.cs

@@ -8,8 +8,24 @@
 
 namespace UnityExplorer.UI
 {
-    public class InputFieldRef : UIBehaviourModel
+    public class InputFieldRef : UIModel
     {
+        public static readonly HashSet<InputFieldRef> inputsPendingUpdate = new HashSet<InputFieldRef>();
+
+        public static void UpdateInstances()
+        {
+            if (inputsPendingUpdate.Any())
+            {
+                foreach (var entry in inputsPendingUpdate)
+                {
+                    LayoutRebuilder.MarkLayoutForRebuild(entry.Rect);
+                    entry.OnValueChanged?.Invoke(entry.Component.text);
+                }
+
+                inputsPendingUpdate.Clear();
+            }
+        }
+
         public InputFieldRef(InputField component) 
         { 
             this.Component = component;
@@ -33,22 +49,11 @@ public string Text
         public TextGenerator TextGenerator => Component.cachedInputTextGenerator;
         public bool ReachedMaxVerts => TextGenerator.vertexCount >= UIManager.MAX_TEXT_VERTS;
 
-        private bool updatedWanted;
 
         private void OnInputChanged(string value)
         {
-            updatedWanted = true;
-        }
-
-        public override void Update()
-        {
-            if (updatedWanted)
-            {
-                LayoutRebuilder.MarkLayoutForRebuild(Rect);
-
-                OnValueChanged?.Invoke(Component.text);
-                updatedWanted = false;
-            }
+            if (!inputsPendingUpdate.Contains(this))
+                inputsPendingUpdate.Add(this);
         }
 
         public override GameObject UIRoot => Component.gameObject;

src/UI/ObjectExplorer/ObjectSearch.cs

@@ -30,7 +30,7 @@ public ObjectSearch(ObjectExplorerPanel parent)
         private string lastCheckedTypeInput;
         private bool lastTypeCanHaveGO; 
 
-        public ButtonListSource<object> dataHandler;
+        public ButtonListHandler<object, ButtonCell> dataHandler;
 
         private ScrollPool<ButtonCell> resultsScrollPool;
         private List<object> currentResults = new List<object>();
@@ -74,7 +74,7 @@ public void DoSearch()
 
         public void Update()
         {
-            if (lastCheckedTypeInput != desiredTypeInput)
+            if (m_context == SearchContext.UnityObject && lastCheckedTypeInput != desiredTypeInput)
             {
                 lastCheckedTypeInput = desiredTypeInput;
 
@@ -101,10 +101,9 @@ private void OnContextDropdownChanged(int value)
         {
             m_context = (SearchContext)value;
 
-            bool shouldShowGoFilters = m_context == SearchContext.UnityObject;
-
-            sceneFilterRow.SetActive(shouldShowGoFilters);
-            childFilterRow.SetActive(shouldShowGoFilters);
+            lastCheckedTypeInput = null;
+            sceneFilterRow.SetActive(false);
+            childFilterRow.SetActive(false);
 
             unityObjectClassRow.SetActive(m_context == SearchContext.UnityObject);
         }
@@ -244,11 +243,9 @@ public override void ConstructUI(GameObject parent)
 
             // RESULTS SCROLL POOL
 
-            dataHandler = new ButtonListSource<object>(resultsScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
-            resultsScrollPool = UIFactory.CreateScrollPool<ButtonCell>(uiRoot, "ResultsList", out GameObject scrollObj, out GameObject scrollContent);
-
-            //if (!Pool<ButtonCell>.PrototypeObject)
-            //    Pool<ButtonCell>.PrototypeObject = ButtonCell.CreatePrototypeCell(Pool<ButtonCell>.InactiveHolder).gameObject;
+            dataHandler = new ButtonListHandler<object, ButtonCell>(resultsScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
+            resultsScrollPool = UIFactory.CreateScrollPool<ButtonCell>(uiRoot, "ResultsList", out GameObject scrollObj, 
+                out GameObject scrollContent);
 
             resultsScrollPool.Initialize(dataHandler);
             UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);

src/UI/ObjectExplorer/SceneExplorer.cs

@@ -120,6 +120,11 @@ private void PopulateSceneDropdown()
 
         private void OnFilterInput(string input)
         {
+            if ((!string.IsNullOrEmpty(input) && !Tree.Filtering) || (string.IsNullOrEmpty(input) && Tree.Filtering))
+            {
+                Tree.displayedObjects.Clear();
+            }
+
             Tree.CurrentFilter = input;
             Tree.RefreshData(true, true);
         }
@@ -208,7 +213,7 @@ public override void ConstructUI(GameObject content)
             UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
             UIFactory.SetLayoutElement(scrollContent, flexibleHeight: 9999);
 
-            Tree = new TransformTree(scrollPool) { GetRootEntriesMethod = GetRootEntries };
+            Tree = new TransformTree(scrollPool, GetRootEntries);
             Tree.Init();
             Tree.RefreshData(true, true);
             //scrollPool.Viewport.GetComponent<Mask>().enabled = false;

src/UI/Panels/CSConsolePanel.cs

@@ -15,7 +15,7 @@ public class CSConsolePanel : UIPanel
     {
         public override string Name => "C# Console";
         public override UIManager.Panels PanelType => UIManager.Panels.CSConsole;
-        public override int MinWidth => 740;
+        public override int MinWidth => 750;
         public override int MinHeight => 300;
 
         public InputFieldScroller InputScroll { get; private set; }