Backups/UnityExplorer_Fix
1
0
Fork 0
mirror of https://github.com/GrahamKracker/UnityExplorer.git synced 2025-07-01 19:13:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Auto-cleanup

Browse Source
This commit is contained in:
Sinai
2021-06-05 19:36:09 +10:00
parent 8fab9e6268
commit 16335c1bc4
57 changed files with 194 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Core/Config/ConfigManager.cs
View File

@ -16,18 +16,18 @@ namespace UnityExplorer.Core.Config
// See the UnityExplorer.Loader namespace for the implementations. // See the UnityExplorer.Loader namespace for the implementations.
public static ConfigHandler Handler { get; private set; } public static ConfigHandler Handler { get; private set; }
public static ConfigElement<KeyCode> Master_Toggle; public static ConfigElement<KeyCode> Master_Toggle;
public static ConfigElement<UIManager.VerticalAnchor> Main_Navbar_Anchor; public static ConfigElement<UIManager.VerticalAnchor> Main_Navbar_Anchor;
public static ConfigElement<bool> Force_Unlock_Mouse; public static ConfigElement<bool> Force_Unlock_Mouse;
public static ConfigElement<KeyCode> Force_Unlock_Toggle; public static ConfigElement<KeyCode> Force_Unlock_Toggle;
public static ConfigElement<bool> Aggressive_Mouse_Unlock; public static ConfigElement<bool> Aggressive_Mouse_Unlock;
public static ConfigElement<bool> Disable_EventSystem_Override; public static ConfigElement<bool> Disable_EventSystem_Override;
public static ConfigElement<string> Default_Output_Path; public static ConfigElement<string> Default_Output_Path;
public static ConfigElement<bool> Log_Unity_Debug; public static ConfigElement<bool> Log_Unity_Debug;
public static ConfigElement<bool> Hide_On_Startup; public static ConfigElement<bool> Hide_On_Startup;
public static ConfigElement<float> Startup_Delay_Time; public static ConfigElement<float> Startup_Delay_Time;
public static ConfigElement<string> Reflection_Signature_Blacklist; public static ConfigElement<string> Reflection_Signature_Blacklist;
// internal configs // internal configs
internal static InternalConfigHandler InternalHandler { get; private set; } internal static InternalConfigHandler InternalHandler { get; private set; }

8
src/Core/Input/CursorUnlocker.cs
View File

@ -1,12 +1,12 @@
using System; using System;
using System.Collections;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityExplorer.Core.Input;
using BF = System.Reflection.BindingFlags;
using UnityExplorer.Core.Config;
using UnityExplorer.Core; using UnityExplorer.Core;
using UnityExplorer.Core.Config;
using UnityExplorer.Core.Input;
using UnityExplorer.UI; using UnityExplorer.UI;
using System.Collections; using BF = System.Reflection.BindingFlags;
namespace UnityExplorer.Core.Input namespace UnityExplorer.Core.Input

4
src/Core/Input/InputManager.cs
View File

@ -1,6 +1,6 @@
using System; using System;
using UnityEngine;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
namespace UnityExplorer.Core.Input namespace UnityExplorer.Core.Input
@ -74,7 +74,7 @@ namespace UnityExplorer.Core.Input
ExplorerCore.Log("Initialized Legacy Input support"); ExplorerCore.Log("Initialized Legacy Input support");
return; return;
} }
catch catch
{ {
// It's not working, we'll fall back to InputSystem. // It's not working, we'll fall back to InputSystem.
} }

4
src/Core/Input/InputSystem.cs
View File

@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection; using System.Reflection;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityExplorer.UI; using UnityExplorer.UI;
using System.Collections.Generic;
using System.Linq;
namespace UnityExplorer.Core.Input namespace UnityExplorer.Core.Input
{ {

38
src/Core/Reflection/Il2CppReflection.cs
View File

@ -37,7 +37,7 @@ namespace UnityExplorer
$"deobfuscated types count: {DeobfuscatedTypes.Count}"); $"deobfuscated types count: {DeobfuscatedTypes.Count}");
} }
#region IL2CPP Extern and pointers #region IL2CPP Extern and pointers
// Extern C++ methods // Extern C++ methods
[DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
@ -63,10 +63,10 @@ namespace UnityExplorer
return il2cppPtr != IntPtr.Zero; return il2cppPtr != IntPtr.Zero;
} }
#endregion #endregion
#region Deobfuscation cache #region Deobfuscation cache
private static readonly Dictionary<string, Type> DeobfuscatedTypes = new Dictionary<string, Type>(); private static readonly Dictionary<string, Type> DeobfuscatedTypes = new Dictionary<string, Type>();
private static readonly Dictionary<string, string> reverseDeobCache = new Dictionary<string, string>(); private static readonly Dictionary<string, string> reverseDeobCache = new Dictionary<string, string>();
@ -111,7 +111,7 @@ namespace UnityExplorer
return theString; return theString;
} }
#endregion #endregion
// Get type by name // Get type by name
@ -124,7 +124,7 @@ namespace UnityExplorer
return base.Internal_GetTypeByName(fullName); return base.Internal_GetTypeByName(fullName);
} }
#region Get actual type #region Get actual type
internal override Type Internal_GetActualType(object obj) internal override Type Internal_GetActualType(object obj)
{ {
@ -183,10 +183,10 @@ namespace UnityExplorer
return monoType; return monoType;
} }
#endregion #endregion
#region Casting #region Casting
private static readonly Dictionary<string, IntPtr> cppClassPointers = new Dictionary<string, IntPtr>(); private static readonly Dictionary<string, IntPtr> cppClassPointers = new Dictionary<string, IntPtr>();
@ -278,10 +278,10 @@ namespace UnityExplorer
// return il2cpp_class_is_assignable_from(thisTypePtr, fromTypePtr); // return il2cpp_class_is_assignable_from(thisTypePtr, fromTypePtr);
//} //}
#endregion #endregion
#region Boxing and unboxing ValueTypes #region Boxing and unboxing ValueTypes
// cached il2cpp unbox methods // cached il2cpp unbox methods
internal static readonly Dictionary<string, MethodInfo> unboxMethods = new Dictionary<string, MethodInfo>(); internal static readonly Dictionary<string, MethodInfo> unboxMethods = new Dictionary<string, MethodInfo>();
@ -384,10 +384,10 @@ namespace UnityExplorer
return cppStruct; return cppStruct;
} }
#endregion #endregion
#region String boxing/unboxing #region String boxing/unboxing
private const string IL2CPP_STRING_FULLNAME = "Il2CppSystem.String"; private const string IL2CPP_STRING_FULLNAME = "Il2CppSystem.String";
private const string STRING_FULLNAME = "System.String"; private const string STRING_FULLNAME = "System.String";
@ -428,10 +428,10 @@ namespace UnityExplorer
return s; return s;
} }
#endregion #endregion
#region Singleton finder #region Singleton finder
internal override void Internal_FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances) internal override void Internal_FindSingleton(string[] possibleNames, Type type, BF flags, List<object> instances)
{ {
@ -453,10 +453,10 @@ namespace UnityExplorer
base.Internal_FindSingleton(possibleNames, type, flags, instances); base.Internal_FindSingleton(possibleNames, type, flags, instances);
} }
#endregion #endregion
#region Force-loading game modules #region Force-loading game modules
internal static string UnhollowedFolderPath => Path.GetFullPath( internal static string UnhollowedFolderPath => Path.GetFullPath(
#if ML #if ML
@ -513,10 +513,10 @@ namespace UnityExplorer
return false; return false;
} }
#endregion #endregion
#region Il2cpp reflection blacklist #region Il2cpp reflection blacklist
public override string[] DefaultReflectionBlacklist => defaultIl2CppBlacklist.ToArray(); public override string[] DefaultReflectionBlacklist => defaultIl2CppBlacklist.ToArray();
@ -665,10 +665,10 @@ namespace UnityExplorer
"UnityEngine.XR.InputDevice.SendHapticImpulse", "UnityEngine.XR.InputDevice.SendHapticImpulse",
}; };
#endregion #endregion
#region IL2CPP IEnumerable and IDictionary #region IL2CPP IEnumerable and IDictionary
protected override bool Internal_TryGetEntryType(Type enumerableType, out Type type) protected override bool Internal_TryGetEntryType(Type enumerableType, out Type type)
{ {

16
src/Core/Reflection/ReflectionUtility.cs
View File

@ -4,11 +4,11 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using BF = System.Reflection.BindingFlags;
using UnityExplorer.Core.Runtime;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
using UnityExplorer.Core.Config; using UnityExplorer.Core.Config;
using UnityExplorer.Core.Runtime;
using BF = System.Reflection.BindingFlags;
namespace UnityExplorer namespace UnityExplorer
{ {
@ -225,7 +225,7 @@ namespace UnityExplorer
return ret; return ret;
} }
#endregion #endregion
#region Type and Generic Parameter implementation cache #region Type and Generic Parameter implementation cache
@ -360,7 +360,7 @@ namespace UnityExplorer
return genericParameterInheritance[key]; return genericParameterInheritance[key];
} }
#endregion #endregion
#region Internal MemberInfo Cache #region Internal MemberInfo Cache
@ -493,7 +493,7 @@ namespace UnityExplorer
// Temp fix for IL2CPP until interface support improves // Temp fix for IL2CPP until interface support improves
// IsEnumerable // IsEnumerable
public static bool IsEnumerable(Type type) => Instance.Internal_IsEnumerable(type); public static bool IsEnumerable(Type type) => Instance.Internal_IsEnumerable(type);
@ -505,7 +505,7 @@ namespace UnityExplorer
// TryGetEnumerator (list) // TryGetEnumerator (list)
public static bool TryGetEnumerator(object list, out IEnumerator enumerator) public static bool TryGetEnumerator(object list, out IEnumerator enumerator)
=> Instance.Internal_TryGetEnumerator(list, out enumerator); => Instance.Internal_TryGetEnumerator(list, out enumerator);
protected virtual bool Internal_TryGetEnumerator(object list, out IEnumerator enumerator) protected virtual bool Internal_TryGetEnumerator(object list, out IEnumerator enumerator)
@ -546,7 +546,7 @@ namespace UnityExplorer
type = typeof(object); type = typeof(object);
return false; return false;
} }
// IsDictionary // IsDictionary
public static bool IsDictionary(Type type) => Instance.Internal_IsDictionary(type); public static bool IsDictionary(Type type) => Instance.Internal_IsDictionary(type);
@ -558,7 +558,7 @@ namespace UnityExplorer
// TryGetEnumerator (dictionary) // TryGetEnumerator (dictionary)
public static bool TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator) public static bool TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator)
=> Instance.Internal_TryGetDictEnumerator(dictionary, out dictEnumerator); => Instance.Internal_TryGetDictEnumerator(dictionary, out dictEnumerator);
protected virtual bool Internal_TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator) protected virtual bool Internal_TryGetDictEnumerator(object dictionary, out IEnumerator<DictionaryEntry> dictEnumerator)

2
src/Core/Runtime/Mono/MonoProvider.cs
View File

@ -143,7 +143,7 @@ public static class MonoExtensions
{ {
if (pi_childControlHeight == null) if (pi_childControlHeight == null)
pi_childControlHeight = group.GetType().GetProperty("childControlHeight"); pi_childControlHeight = group.GetType().GetProperty("childControlHeight");
pi_childControlHeight?.SetValue(group, value, null); pi_childControlHeight?.SetValue(group, value, null);
} }

14
src/Core/Tests/TestClass.cs
View File

@ -2,11 +2,11 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
using UnityExplorer.UI.CacheObject.IValues;
using System.Reflection;
using UnityExplorer.UI; using UnityExplorer.UI;
using UnityExplorer.UI.CacheObject.IValues;
#if CPP #if CPP
using UnhollowerRuntimeLib; using UnhollowerRuntimeLib;
using UnhollowerBaseLib; using UnhollowerBaseLib;
@ -16,7 +16,7 @@ namespace UnityExplorer.Tests
{ {
public class TestIndexer : IList<int> public class TestIndexer : IList<int>
{ {
private readonly List<int> list = new List<int>() { 1,2,3,4,5 }; private readonly List<int> list = new List<int>() { 1, 2, 3, 4, 5 };
public int Count => list.Count; public int Count => list.Count;
public bool IsReadOnly => false; public bool IsReadOnly => false;
@ -133,21 +133,21 @@ namespace UnityExplorer.Tests
} }
} }
private static void TestGeneric<T>() private static void TestGeneric<T>()
{ {
ExplorerCore.Log("Test1 " + typeof(T).FullName); ExplorerCore.Log("Test1 " + typeof(T).FullName);
} }
private static void TestGenericClass<T>() where T : class private static void TestGenericClass<T>() where T : class
{ {
ExplorerCore.Log("Test2 " + typeof(T).FullName); ExplorerCore.Log("Test2 " + typeof(T).FullName);
} }
private static void TestComponent<T>() where T : Component private static void TestComponent<T>() where T : Component
{ {
ExplorerCore.Log("Test3 " + typeof(T).FullName); ExplorerCore.Log("Test3 " + typeof(T).FullName);
} }
private static void TestStruct<T>() where T : struct private static void TestStruct<T>() where T : struct
{ {
ExplorerCore.Log("Test3 " + typeof(T).FullName); ExplorerCore.Log("Test3 " + typeof(T).FullName);

6
src/Core/Utility/ParseUtility.cs
View File

@ -22,7 +22,7 @@ namespace UnityExplorer
public const string NUMBER_FORMAT = "0.####"; public const string NUMBER_FORMAT = "0.####";
private static readonly Dictionary<int, string> numSequenceStrings = new Dictionary<int, string>(); private static readonly Dictionary<int, string> numSequenceStrings = new Dictionary<int, string>();
// Helper for formatting float/double/decimal numbers to maximum of 4 decimal points. // Helper for formatting float/double/decimal numbers to maximum of 4 decimal points.
public static string FormatDecimalSequence(params object[] numbers) public static string FormatDecimalSequence(params object[] numbers)
{ {
@ -100,7 +100,7 @@ namespace UnityExplorer
obj = ReflectionUtility.GetMethodInfo(type, "Parse", ArgumentUtility.ParseArgs) obj = ReflectionUtility.GetMethodInfo(type, "Parse", ArgumentUtility.ParseArgs)
.Invoke(null, new object[] { input }); .Invoke(null, new object[] { input });
} }
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
@ -148,7 +148,7 @@ namespace UnityExplorer
} }
else else
return obj.ToString(); return obj.ToString();
} }
catch (Exception ex) catch (Exception ex)
{ {

14
src/Core/Utility/SignatureHighlighter.cs
View File

@ -151,10 +151,10 @@ namespace UnityExplorer
private static string HighlightType(Type type) private static string HighlightType(Type type)
{ {
string key = type.ToString(); string key = type.ToString();
if (typeToRichType.ContainsKey(key)) if (typeToRichType.ContainsKey(key))
return typeToRichType[key]; return typeToRichType[key];
var sb = new StringBuilder(type.Name); var sb = new StringBuilder(type.Name);
bool isArray = false; bool isArray = false;
@ -212,7 +212,7 @@ namespace UnityExplorer
{ {
if (args.Length < 1) if (args.Length < 1)
return string.Empty; return string.Empty;
var sb = new StringBuilder(); var sb = new StringBuilder();
for (int i = 0; i < args.Length; i++) for (int i = 0; i < args.Length; i++)
@ -254,7 +254,7 @@ namespace UnityExplorer
isStatic = true; isStatic = true;
return FIELD_STATIC; return FIELD_STATIC;
} }
return FIELD_INSTANCE; return FIELD_INSTANCE;
} }
else if (memberInfo is MethodInfo mi) else if (memberInfo is MethodInfo mi)
@ -264,7 +264,7 @@ namespace UnityExplorer
isStatic = true; isStatic = true;
return METHOD_STATIC; return METHOD_STATIC;
} }
return METHOD_INSTANCE; return METHOD_INSTANCE;
} }
else if (memberInfo is PropertyInfo pi) else if (memberInfo is PropertyInfo pi)
@ -274,7 +274,7 @@ namespace UnityExplorer
isStatic = true; isStatic = true;
return PROP_STATIC; return PROP_STATIC;
} }
return PROP_INSTANCE; return PROP_INSTANCE;
} }
//else if (memberInfo is EventInfo ei) //else if (memberInfo is EventInfo ei)
@ -284,7 +284,7 @@ namespace UnityExplorer
// isStatic = true; // isStatic = true;
// return EVENT_STATIC; // return EVENT_STATIC;
// } // }
// return EVENT_INSTANCE; // return EVENT_INSTANCE;
//} //}

6
src/Core/Utility/ToStringUtility.cs
View File

@ -81,7 +81,7 @@ namespace UnityExplorer
sb.Append(PruneString(obj.name, 50, 1)); sb.Append(PruneString(obj.name, 50, 1));
sb.Append('"'); sb.Append('"');
} }
AppendRichType(sb, richType); AppendRichType(sb, richType);
} }
else if (type.FullName.StartsWith(eventSystemNamespace)) else if (type.FullName.StartsWith(eventSystemNamespace))
@ -93,8 +93,8 @@ namespace UnityExplorer
{ {
var toString = ToString(value); var toString = ToString(value);
if (type.IsGenericType if (type.IsGenericType
|| toString == type.FullName || toString == type.FullName
|| toString == $"{type.FullName} {type.FullName}" || toString == $"{type.FullName} {type.FullName}"
|| toString == $"Il2Cpp{type.FullName}" || type.FullName == $"Il2Cpp{toString}") || toString == $"Il2Cpp{type.FullName}" || type.FullName == $"Il2Cpp{toString}")
{ {

10
src/ExplorerCore.cs
View File

@ -103,15 +103,15 @@ namespace UnityExplorer
RuntimeProvider.Instance.ProcessOnPostRender(); RuntimeProvider.Instance.ProcessOnPostRender();
} }
#region LOGGING #region LOGGING
public static void Log(object message) public static void Log(object message)
=> Log(message, LogType.Log); => Log(message, LogType.Log);
public static void LogWarning(object message) public static void LogWarning(object message)
=> Log(message, LogType.Warning); => Log(message, LogType.Warning);
public static void LogError(object message) public static void LogError(object message)
=> Log(message, LogType.Error); => Log(message, LogType.Error);
public static void LogUnity(object message, LogType logType) public static void LogUnity(object message, LogType logType)
@ -146,6 +146,6 @@ namespace UnityExplorer
} }
} }
#endregion #endregion
} }
} }

2
src/Loader/BIE/BepInExConfigHandler.cs
View File

@ -27,7 +27,7 @@ namespace UnityExplorer.Loader.BIE
var entry = Config.Bind(CTG_NAME, config.Name, config.Value, new ConfigDescription(config.Description, null, tags)); var entry = Config.Bind(CTG_NAME, config.Name, config.Value, new ConfigDescription(config.Description, null, tags));
entry.SettingChanged += (object o, EventArgs e) => entry.SettingChanged += (object o, EventArgs e) =>
{ {
config.Value = entry.Value; config.Value = entry.Value;
}; };

8
src/Loader/BIE/ExplorerBepInPlugin.cs
View File

@ -7,12 +7,12 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using UnityExplorer.Core.Config;
using UnityExplorer.Loader.BIE;
using UnityEngine; using UnityEngine;
using UnityExplorer.Core;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityExplorer.Core;
using UnityExplorer.Core.Config;
using UnityExplorer.Core.Input; using UnityExplorer.Core.Input;
using UnityExplorer.Loader.BIE;
#if CPP #if CPP
using BepInEx.IL2CPP; using BepInEx.IL2CPP;
using UnhollowerRuntimeLib; using UnhollowerRuntimeLib;
@ -50,7 +50,7 @@ namespace UnityExplorer
public Action<object> OnLogMessage => LogSource.LogMessage; public Action<object> OnLogMessage => LogSource.LogMessage;
public Action<object> OnLogWarning => LogSource.LogWarning; public Action<object> OnLogWarning => LogSource.LogWarning;
public Action<object> OnLogError => LogSource.LogError; public Action<object> OnLogError => LogSource.LogError;
// Init common to Mono and Il2Cpp // Init common to Mono and Il2Cpp
internal void UniversalInit() internal void UniversalInit()

8
src/UI/CSConsole/CSAutoCompleter.cs
View File

@ -22,7 +22,6 @@ namespace UnityExplorer.UI.CSConsole
AutoCompleteModal.Instance.ReleaseOwnership(this); AutoCompleteModal.Instance.ReleaseOwnership(this);
} }
// Delimiters for completions, notably does not include '.'
private readonly HashSet<char> delimiters = new HashSet<char> private readonly HashSet<char> delimiters = new HashSet<char>
{ {
'{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&', '?' '{', '}', ',', ';', '<', '>', '(', ')', '[', ']', '=', '|', '&', '?'
@ -67,11 +66,10 @@ namespace UnityExplorer.UI.CSConsole
} }
string input = InputField.Text.Substring(startIdx, caret - startIdx + 1); string input = InputField.Text.Substring(startIdx, caret - startIdx + 1);
// Get MCS completions // Get MCS completions
string[] evaluatorCompletions = ConsoleController.Evaluator.GetCompletions(input, out string prefix); string[] evaluatorCompletions = ConsoleController.Evaluator.GetCompletions(input, out string prefix);
if (evaluatorCompletions != null && evaluatorCompletions.Any()) if (evaluatorCompletions != null && evaluatorCompletions.Any())
{ {
suggestions.AddRange(from completion in evaluatorCompletions suggestions.AddRange(from completion in evaluatorCompletions
@ -100,7 +98,7 @@ namespace UnityExplorer.UI.CSConsole
{ {
if (!keywordHighlights.ContainsKey(kw)) if (!keywordHighlights.ContainsKey(kw))
keywordHighlights.Add(kw, $"<color=#{SignatureHighlighter.keywordBlueHex}>{kw}</color>"); keywordHighlights.Add(kw, $"<color=#{SignatureHighlighter.keywordBlueHex}>{kw}</color>");
string completion = kw.Substring(input.Length, kw.Length - input.Length); string completion = kw.Substring(input.Length, kw.Length - input.Length);
suggestions.Add(new Suggestion(keywordHighlights[kw], completion)); suggestions.Add(new Suggestion(keywordHighlights[kw], completion));
} }
@ -124,7 +122,7 @@ namespace UnityExplorer.UI.CSConsole
private readonly StringBuilder highlightBuilder = new StringBuilder(); private readonly StringBuilder highlightBuilder = new StringBuilder();
private const string OPEN_HIGHLIGHT = "<color=cyan>"; private const string OPEN_HIGHLIGHT = "<color=cyan>";
private string GetHighlightString(string prefix, string completion) private string GetHighlightString(string prefix, string completion)
{ {
highlightBuilder.Clear(); highlightBuilder.Clear();

12
src/UI/CSConsole/ConsoleController.cs
View File

@ -1,18 +1,18 @@
using System; using Mono.CSharp;
using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
using UnityExplorer.UI.CSConsole;
using UnityExplorer.Core.Input; using UnityExplorer.Core.Input;
using UnityExplorer.UI.CSConsole;
using UnityExplorer.UI.Panels; using UnityExplorer.UI.Panels;
using UnityExplorer.UI.Widgets.AutoComplete; using UnityExplorer.UI.Widgets.AutoComplete;
using System.Reflection;
using Mono.CSharp;
namespace UnityExplorer.UI.CSConsole namespace UnityExplorer.UI.CSConsole
{ {
@ -221,7 +221,7 @@ namespace UnityExplorer.UI.CSConsole
if (InputManager.GetKeyDown(KeyCode.Escape)) if (InputManager.GetKeyDown(KeyCode.Escape))
{ {
Input.Text = previousInput; Input.Text = previousInput;
if (EnableSuggestions && AutoCompleteModal.CheckEscape(Completer)) if (EnableSuggestions && AutoCompleteModal.CheckEscape(Completer))
OnAutocompleteEscaped(); OnAutocompleteEscaped();
@ -240,7 +240,7 @@ namespace UnityExplorer.UI.CSConsole
} }
var inStringOrComment = HighlightVisibleInput(); var inStringOrComment = HighlightVisibleInput();
if (!settingCaretCoroutine) if (!settingCaretCoroutine)
{ {
if (EnableSuggestions) if (EnableSuggestions)

2
src/UI/CSConsole/Lexers/CommentLexer.cs
View File

@ -44,7 +44,7 @@ namespace UnityExplorer.UI.CSConsole.Lexers
while (!lexer.EndOfInput && !(lexer.Current == '/' && lexer.Previous == '*')); while (!lexer.EndOfInput && !(lexer.Current == '/' && lexer.Previous == '*'));
return true; return true;
} }
} }
return false; return false;

10
src/UI/CSConsole/Lexers/KeywordLexer.cs
View File

@ -12,12 +12,12 @@ namespace UnityExplorer.UI.CSConsole.Lexers
public static readonly HashSet<string> keywords = new HashSet<string> public static readonly HashSet<string> keywords = new HashSet<string>
{ {
// reserved keywords // reserved keywords
"abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue",
"decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally",
"fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock",
"long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public", "long", "namespace", "new", "null", "object", "operator", "out", "override", "params", "private", "protected", "public",
"readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch",
"this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void",
"volatile", "while", "volatile", "while",
// contextual keywords // contextual keywords
"add", "and", "alias", "ascending", "async", "await", "by", "descending", "dynamic", "equals", "from", "get", "add", "and", "alias", "ascending", "async", "await", "by", "descending", "dynamic", "equals", "from", "get",

2
src/UI/CSConsole/Lexers/Lexer.cs
View File

@ -1,6 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine;
using System.Linq; using System.Linq;
using UnityEngine;
namespace UnityExplorer.UI.CSConsole.Lexers namespace UnityExplorer.UI.CSConsole.Lexers
{ {

4
src/UI/CSConsole/ScriptEvaluator.cs
View File

@ -1,9 +1,9 @@
using System; using Mono.CSharp;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using Mono.CSharp;
// Thanks to ManlyMarco for this // Thanks to ManlyMarco for this

10
src/UI/CSConsole/ScriptInteraction.cs
View File

@ -1,11 +1,11 @@
using System; using Mono.CSharp;
using Mono.CSharp; using System;
using System.Collections; using System.Collections;
using UnityEngine;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using UnityExplorer.Core.Runtime;
using System.Text; using System.Text;
using UnityEngine;
using UnityExplorer.Core.Runtime;
/* /*
Welcome to the UnityExplorer C# Console! Welcome to the UnityExplorer C# Console!
@ -58,7 +58,7 @@ namespace UnityExplorer.UI.CSConsole
public static void GetClasses() public static void GetClasses()
{ {
if (ReflectionUtility.GetFieldInfo(typeof(Evaluator), "source_file") if (ReflectionUtility.GetFieldInfo(typeof(Evaluator), "source_file")
.GetValue(Evaluator) is CompilationSourceFile sourceFile .GetValue(Evaluator) is CompilationSourceFile sourceFile
&& sourceFile.Containers.Any()) && sourceFile.Containers.Any())
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();

2
src/UI/CacheObject/CacheKeyValuePair.cs
View File

@ -2,8 +2,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using UnityExplorer.UI.CacheObject.Views;
using UnityExplorer.UI.CacheObject.IValues; using UnityExplorer.UI.CacheObject.IValues;
using UnityExplorer.UI.CacheObject.Views;
namespace UnityExplorer.UI.CacheObject namespace UnityExplorer.UI.CacheObject
{ {

2
src/UI/CacheObject/CacheListEntry.cs
View File

@ -2,8 +2,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using UnityExplorer.UI.CacheObject.Views;
using UnityExplorer.UI.CacheObject.IValues; using UnityExplorer.UI.CacheObject.IValues;
using UnityExplorer.UI.CacheObject.Views;
namespace UnityExplorer.UI.CacheObject namespace UnityExplorer.UI.CacheObject
{ {

10
src/UI/CacheObject/CacheMember.cs
View File

@ -15,7 +15,7 @@ namespace UnityExplorer.UI.CacheObject
{ {
//public ReflectionInspector ParentInspector { get; internal set; } //public ReflectionInspector ParentInspector { get; internal set; }
//public bool AutoUpdateWanted { get; internal set; } //public bool AutoUpdateWanted { get; internal set; }
public abstract Type DeclaringType { get; } public abstract Type DeclaringType { get; }
public string NameForFiltering { get; protected set; } public string NameForFiltering { get; protected set; }
public object DeclaringInstance => IsStatic ? null : (m_declaringInstance ?? (m_declaringInstance = Owner.Target.TryCast(DeclaringType))); public object DeclaringInstance => IsStatic ? null : (m_declaringInstance ?? (m_declaringInstance = Owner.Target.TryCast(DeclaringType)));
@ -27,7 +27,7 @@ namespace UnityExplorer.UI.CacheObject
public Type[] GenericArguments { get; protected set; } = ArgumentUtility.EmptyTypes; public Type[] GenericArguments { get; protected set; } = ArgumentUtility.EmptyTypes;
public EvaluateWidget Evaluator { get; protected set; } public EvaluateWidget Evaluator { get; protected set; }
public bool Evaluating => Evaluator != null && Evaluator.UIRoot.activeSelf; public bool Evaluating => Evaluator != null && Evaluator.UIRoot.activeSelf;
public virtual void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member) public virtual void SetInspectorOwner(ReflectionInspector inspector, MemberInfo member)
{ {
this.Owner = inspector; this.Owner = inspector;
@ -234,7 +234,7 @@ namespace UnityExplorer.UI.CacheObject
return sorted; return sorted;
} }
private static void TryCacheMember(MemberInfo member, List<CacheMember> list, HashSet<string> cachedSigs, private static void TryCacheMember(MemberInfo member, List<CacheMember> list, HashSet<string> cachedSigs,
Type declaringType, ReflectionInspector _inspector, bool ignorePropertyMethodInfos = true) Type declaringType, ReflectionInspector _inspector, bool ignorePropertyMethodInfos = true)
{ {
try try
@ -253,7 +253,7 @@ namespace UnityExplorer.UI.CacheObject
case MemberTypes.Method: case MemberTypes.Method:
{ {
var mi = member as MethodInfo; var mi = member as MethodInfo;
if (ignorePropertyMethodInfos if (ignorePropertyMethodInfos
&& (mi.Name.StartsWith("get_") || mi.Name.StartsWith("set_"))) && (mi.Name.StartsWith("get_") || mi.Name.StartsWith("set_")))
return; return;
@ -322,7 +322,7 @@ namespace UnityExplorer.UI.CacheObject
} }
} }
internal static string GetSig(MemberInfo member) internal static string GetSig(MemberInfo member)
=> $"{member.DeclaringType.Name}.{member.Name}"; => $"{member.DeclaringType.Name}.{member.Name}";
internal static string GetArgumentString(ParameterInfo[] args) internal static string GetArgumentString(ParameterInfo[] args)

12
src/UI/CacheObject/CacheObjectBase.cs
View File

@ -7,8 +7,8 @@ using System.Text;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityExplorer.Core.Runtime; using UnityExplorer.Core.Runtime;
using UnityExplorer.UI.CacheObject.Views;
using UnityExplorer.UI.CacheObject.IValues; using UnityExplorer.UI.CacheObject.IValues;
using UnityExplorer.UI.CacheObject.Views;
using UnityExplorer.UI.Models; using UnityExplorer.UI.Models;
namespace UnityExplorer.UI.CacheObject namespace UnityExplorer.UI.CacheObject
@ -180,8 +180,8 @@ namespace UnityExplorer.UI.CacheObject
return ValueState.Enum; return ValueState.Enum;
else if (type == typeof(Color) || type == typeof(Color32)) else if (type == typeof(Color) || type == typeof(Color32))
return ValueState.Color; return ValueState.Color;
else if (InteractiveValueStruct.SupportsType(type)) else if (InteractiveValueStruct.SupportsType(type))
return ValueState.ValueStruct; return ValueState.ValueStruct;
else if (ReflectionUtility.IsDictionary(type)) else if (ReflectionUtility.IsDictionary(type))
return ValueState.Dictionary; return ValueState.Dictionary;
else if (!typeof(Transform).IsAssignableFrom(type) && ReflectionUtility.IsEnumerable(type)) else if (!typeof(Transform).IsAssignableFrom(type) && ReflectionUtility.IsEnumerable(type))
@ -197,7 +197,7 @@ namespace UnityExplorer.UI.CacheObject
switch (State) switch (State)
{ {
case ValueState.NotEvaluated: case ValueState.NotEvaluated:
return $"<i>{NOT_YET_EVAL} ({SignatureHighlighter.Parse(FallbackType, true)})</i>"; return $"<i>{NOT_YET_EVAL} ({SignatureHighlighter.Parse(FallbackType, true)})</i>";
case ValueState.Exception: case ValueState.Exception:
return $"<i><color=red>{LastException.ReflectionExToString()}</color></i>"; return $"<i><color=red>{LastException.ReflectionExToString()}</color></i>";
@ -221,7 +221,7 @@ namespace UnityExplorer.UI.CacheObject
return $"\"{ToStringUtility.PruneString(s, 200, 5)}\""; return $"\"{ToStringUtility.PruneString(s, 200, 5)}\"";
} }
break; break;
// try to prefix the count of the collection for lists and dicts // try to prefix the count of the collection for lists and dicts
case ValueState.Collection: case ValueState.Collection:
if (!LastValueWasNull) if (!LastValueWasNull)
@ -263,7 +263,7 @@ namespace UnityExplorer.UI.CacheObject
cell.SubContentHolder.gameObject.SetActive(SubContentShowWanted); cell.SubContentHolder.gameObject.SetActive(SubContentShowWanted);
if (IValue != null) if (IValue != null)
{ {
IValue.UIRoot.transform.SetParent(cell.SubContentHolder.transform, false); IValue.UIRoot.transform.SetParent(cell.SubContentHolder.transform, false);
IValue.SetLayout(); IValue.SetLayout();
} }

2
src/UI/CacheObject/CacheProperty.cs
View File

@ -31,7 +31,7 @@ namespace UnityExplorer.UI.CacheObject
object ret; object ret;
if (HasArguments) if (HasArguments)
ret = PropertyInfo.GetValue(DeclaringInstance, this.Evaluator.TryParseArguments()); ret = PropertyInfo.GetValue(DeclaringInstance, this.Evaluator.TryParseArguments());
else else
ret = PropertyInfo.GetValue(DeclaringInstance, null); ret = PropertyInfo.GetValue(DeclaringInstance, null);
HadException = false; HadException = false;
LastException = null; LastException = null;

2
src/UI/CacheObject/IValues/InteractiveEnum.cs
View File

@ -20,7 +20,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
public CachedEnumValue ValueAtIdx(int idx) => (CachedEnumValue)CurrentValues[idx]; public CachedEnumValue ValueAtIdx(int idx) => (CachedEnumValue)CurrentValues[idx];
public CachedEnumValue ValueAtKey(object key) => (CachedEnumValue)CurrentValues[key]; public CachedEnumValue ValueAtKey(object key) => (CachedEnumValue)CurrentValues[key];
private Dropdown enumDropdown; private Dropdown enumDropdown;
private GameObject toggleHolder; private GameObject toggleHolder;
private readonly List<Toggle> flagToggles = new List<Toggle>(); private readonly List<Toggle> flagToggles = new List<Toggle>();

6
src/UI/CacheObject/IValues/InteractiveList.cs
View File

@ -206,7 +206,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
{ {
ExplorerCore.LogWarning($"Exception setting IList value: {ex}"); ExplorerCore.LogWarning($"Exception setting IList value: {ex}");
} }
} }
// List entry scroll pool // List entry scroll pool
@ -254,8 +254,8 @@ namespace UnityExplorer.UI.CacheObject.IValues
ListScrollPool.Initialize(this, SetLayout); ListScrollPool.Initialize(this, SetLayout);
scrollLayout = scrollObj.GetComponent<LayoutElement>(); scrollLayout = scrollObj.GetComponent<LayoutElement>();
NotSupportedLabel = UIFactory.CreateLabel(ListScrollPool.Content.gameObject, "NotSupportedMessage", NotSupportedLabel = UIFactory.CreateLabel(ListScrollPool.Content.gameObject, "NotSupportedMessage",
"The IEnumerable failed to enumerate. This is likely due to an issue with Unhollowed interfaces.", "The IEnumerable failed to enumerate. This is likely due to an issue with Unhollowed interfaces.",
TextAnchor.MiddleLeft, Color.red); TextAnchor.MiddleLeft, Color.red);
UIFactory.SetLayoutElement(NotSupportedLabel.gameObject, minHeight: 25, flexibleWidth: 9999); UIFactory.SetLayoutElement(NotSupportedLabel.gameObject, minHeight: 25, flexibleWidth: 9999);

8
src/UI/CacheObject/IValues/InteractiveString.cs
View File

@ -18,7 +18,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
public InputFieldRef inputField; public InputFieldRef inputField;
public ButtonRef ApplyButton; public ButtonRef ApplyButton;
public GameObject SaveFileRow; public GameObject SaveFileRow;
public InputFieldRef SaveFilePath; public InputFieldRef SaveFilePath;
@ -36,7 +36,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
{ {
if (s == null) if (s == null)
return false; return false;
return s.Length >= UIManager.MAX_INPUTFIELD_CHARS; return s.Length >= UIManager.MAX_INPUTFIELD_CHARS;
} }
@ -83,7 +83,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
if (File.Exists(path)) if (File.Exists(path))
File.Delete(path); File.Delete(path);
File.WriteAllText(path, RealValue); File.WriteAllText(path, RealValue);
} }
@ -98,7 +98,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
UIFactory.SetLayoutElement(SaveFileRow, flexibleWidth: 9999); UIFactory.SetLayoutElement(SaveFileRow, flexibleWidth: 9999);
UIFactory.SetLayoutGroup<VerticalLayoutGroup>(SaveFileRow, false, true, true, true, 3); UIFactory.SetLayoutGroup<VerticalLayoutGroup>(SaveFileRow, false, true, true, true, 3);
UIFactory.CreateLabel(SaveFileRow, "Info", "<color=red>String is too long! Save to file if you want to see the full string.</color>", UIFactory.CreateLabel(SaveFileRow, "Info", "<color=red>String is too long! Save to file if you want to see the full string.</color>",
TextAnchor.MiddleLeft); TextAnchor.MiddleLeft);
var horizRow = UIFactory.CreateUIObject("Horiz", SaveFileRow); var horizRow = UIFactory.CreateUIObject("Horiz", SaveFileRow);

2
src/UI/CacheObject/IValues/InteractiveValueStruct.cs
View File

@ -143,7 +143,7 @@ namespace UnityExplorer.UI.CacheObject.IValues
ExplorerCore.LogWarning("Exception setting value: " + ex); ExplorerCore.LogWarning("Exception setting value: " + ex);
} }
} }
// UI Setup for type // UI Setup for type
private void SetupUIForType() private void SetupUIForType()

2
src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
View File

@ -4,8 +4,8 @@ using System.Linq;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityExplorer.UI.Inspectors;
using UnityExplorer.UI.CacheObject.IValues; using UnityExplorer.UI.CacheObject.IValues;
using UnityExplorer.UI.Inspectors;
using UnityExplorer.UI.Widgets; using UnityExplorer.UI.Widgets;
namespace UnityExplorer.UI.CacheObject.Views namespace UnityExplorer.UI.CacheObject.Views

2
src/UI/CacheObject/Views/CacheObjectCell.cs
View File

@ -4,8 +4,8 @@ using System.Linq;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityExplorer.UI.Inspectors;
using UnityExplorer.UI.CacheObject.IValues; using UnityExplorer.UI.CacheObject.IValues;
using UnityExplorer.UI.Inspectors;
using UnityExplorer.UI.Widgets; using UnityExplorer.UI.Widgets;
namespace UnityExplorer.UI.CacheObject.Views namespace UnityExplorer.UI.CacheObject.Views

8
src/UI/CacheObject/Views/EvaluateWidget.cs
View File

@ -67,7 +67,7 @@ namespace UnityExplorer.UI.CacheObject.Views
for (int i = 0; i < genericArguments.Length; i++) for (int i = 0; i < genericArguments.Length; i++)
{ {
outArgs[i] = ReflectionUtility.GetTypeByName(genericInput[i]) outArgs[i] = ReflectionUtility.GetTypeByName(genericInput[i])
?? throw new Exception($"Could not find any type by name '{genericInput[i]}'!"); ?? throw new Exception($"Could not find any type by name '{genericInput[i]}'!");
} }
@ -206,7 +206,7 @@ namespace UnityExplorer.UI.CacheObject.Views
var elemType = arg.ParameterType; var elemType = arg.ParameterType;
if (elemType.IsByRef) if (elemType.IsByRef)
elemType = elemType.GetElementType(); elemType = elemType.GetElementType();
argInputFields[i].PlaceholderText.text = $"eg. {ParseUtility.GetExampleInput(elemType)}"; argInputFields[i].PlaceholderText.text = $"eg. {ParseUtility.GetExampleInput(elemType)}";
} }
} }
} }
@ -249,7 +249,7 @@ namespace UnityExplorer.UI.CacheObject.Views
public GameObject CreateContent(GameObject parent) public GameObject CreateContent(GameObject parent)
{ {
UIRoot = UIFactory.CreateVerticalGroup(parent, "EvaluateWidget", false, false, true, true, 3, new Vector4(2, 2, 2, 2), UIRoot = UIFactory.CreateVerticalGroup(parent, "EvaluateWidget", false, false, true, true, 3, new Vector4(2, 2, 2, 2),
new Color(0.15f, 0.15f, 0.15f)); new Color(0.15f, 0.15f, 0.15f));
UIFactory.SetLayoutElement(UIRoot, minWidth: 50, flexibleWidth: 9999, minHeight: 50, flexibleHeight: 800); UIFactory.SetLayoutElement(UIRoot, minWidth: 50, flexibleWidth: 9999, minHeight: 50, flexibleHeight: 800);
//UIRoot.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize; //UIRoot.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
@ -275,7 +275,7 @@ namespace UnityExplorer.UI.CacheObject.Views
// evaluate button // evaluate button
var evalButton = UIFactory.CreateButton(UIRoot, "EvaluateButton", "Evaluate", new Color(0.2f, 0.2f, 0.2f)); var evalButton = UIFactory.CreateButton(UIRoot, "EvaluateButton", "Evaluate", new Color(0.2f, 0.2f, 0.2f));
UIFactory.SetLayoutElement(evalButton.Component.gameObject, minHeight: 25, minWidth: 150, flexibleWidth: 0); UIFactory.SetLayoutElement(evalButton.Component.gameObject, minHeight: 25, minWidth: 150, flexibleWidth: 0);
evalButton.OnClick += () => evalButton.OnClick += () =>
{ {
Owner.EvaluateAndSetCell(); Owner.EvaluateAndSetCell();
}; };

8
src/UI/Inspectors/GameObjectInspector.cs
View File

@ -208,7 +208,7 @@ namespace UnityExplorer.UI.Inspectors
TransformTree.RefreshData(true, false); TransformTree.RefreshData(true, false);
} }
private void OnAddComponentClicked(string input) private void OnAddComponentClicked(string input)
{ {
if (ReflectionUtility.AllTypes.TryGetValue(input, out Type type)) if (ReflectionUtility.AllTypes.TryGetValue(input, out Type type))
@ -234,10 +234,10 @@ namespace UnityExplorer.UI.Inspectors
public override GameObject CreateContent(GameObject parent) public override GameObject CreateContent(GameObject parent)
{ {
UIRoot = UIFactory.CreateVerticalGroup(parent, "GameObjectInspector", true, false, true, true, 5, UIRoot = UIFactory.CreateVerticalGroup(parent, "GameObjectInspector", true, false, true, true, 5,
new Vector4(4, 4, 4, 4), new Color(0.065f, 0.065f, 0.065f)); new Vector4(4, 4, 4, 4), new Color(0.065f, 0.065f, 0.065f));
var scrollObj = UIFactory.CreateScrollView(UIRoot, "GameObjectInspector", out Content, out var scrollbar, var scrollObj = UIFactory.CreateScrollView(UIRoot, "GameObjectInspector", out Content, out var scrollbar,
new Color(0.065f, 0.065f, 0.065f)); new Color(0.065f, 0.065f, 0.065f));
UIFactory.SetLayoutElement(scrollObj, minHeight: 250, preferredHeight: 300, flexibleHeight: 0, flexibleWidth: 9999); UIFactory.SetLayoutElement(scrollObj, minHeight: 250, preferredHeight: 300, flexibleHeight: 0, flexibleWidth: 9999);
@ -245,7 +245,7 @@ namespace UnityExplorer.UI.Inspectors
// Construct GO Controls // Construct GO Controls
GOControls = new GameObjectControls(this); GOControls = new GameObjectControls(this);
ConstructLists(); ConstructLists();
return UIRoot; return UIRoot;

4
src/UI/Inspectors/GameObjectWidgets/ComponentList.cs
View File

@ -11,7 +11,7 @@ namespace UnityExplorer.UI.Inspectors
{ {
public GameObjectInspector Parent; public GameObjectInspector Parent;
public ComponentList(ScrollPool<ComponentCell> scrollPool, Func<List<Component>> getEntriesMethod) public ComponentList(ScrollPool<ComponentCell> scrollPool, Func<List<Component>> getEntriesMethod)
: base(scrollPool, getEntriesMethod, null, null, null) : base(scrollPool, getEntriesMethod, null, null, null)
{ {
base.SetICell = SetComponentCell; base.SetICell = SetComponentCell;
@ -112,7 +112,7 @@ namespace UnityExplorer.UI.Inspectors
cell.BehaviourToggle.interactable = false; cell.BehaviourToggle.interactable = false;
cell.BehaviourToggle.Set(true, false); cell.BehaviourToggle.Set(true, false);
//RuntimeProvider.Instance.SetColorBlock(cell.BehaviourToggle,) //RuntimeProvider.Instance.SetColorBlock(cell.BehaviourToggle,)
cell.BehaviourToggle.graphic.color = new Color(0.2f, 0.2f, 0.2f); cell.BehaviourToggle.graphic.color = new Color(0.2f, 0.2f, 0.2f);
} }
// if component is the first index it must be the transform, dont show Destroy button for it. // if component is the first index it must be the transform, dont show Destroy button for it.

6
src/UI/Inspectors/GameObjectWidgets/GameObjectControls.cs
View File

@ -186,7 +186,7 @@ namespace UnityExplorer.UI.Inspectors
if (parentToSet) if (parentToSet)
DoSetParent(parentToSet); DoSetParent(parentToSet);
else else
{ {
ExplorerCore.LogWarning($"Could not find any GameObject name or path '{input}'!"); ExplorerCore.LogWarning($"Could not find any GameObject name or path '{input}'!");
UpdateGameObjectInfo(false, true); UpdateGameObjectInfo(false, true);
} }
@ -442,7 +442,7 @@ namespace UnityExplorer.UI.Inspectors
private void ConstructTopInfo() private void ConstructTopInfo()
{ {
var topInfoHolder = UIFactory.CreateVerticalGroup(Parent.Content, "TopInfoHolder", false, false, true, true, 3, var topInfoHolder = UIFactory.CreateVerticalGroup(Parent.Content, "TopInfoHolder", false, false, true, true, 3,
new Vector4(3, 3, 3, 3), new Color(0.1f, 0.1f, 0.1f), TextAnchor.MiddleLeft); new Vector4(3, 3, 3, 3), new Color(0.1f, 0.1f, 0.1f), TextAnchor.MiddleLeft);
UIFactory.SetLayoutElement(topInfoHolder, minHeight: 100, flexibleWidth: 9999); UIFactory.SetLayoutElement(topInfoHolder, minHeight: 100, flexibleWidth: 9999);
topInfoHolder.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize; topInfoHolder.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
@ -575,7 +575,7 @@ namespace UnityExplorer.UI.Inspectors
var flagsDrop = UIFactory.CreateDropdown(thirdrow, out FlagsDropdown, "None", 14, OnFlagsDropdownChanged); var flagsDrop = UIFactory.CreateDropdown(thirdrow, out FlagsDropdown, "None", 14, OnFlagsDropdownChanged);
FlagsDropdown.captionText.color = SignatureHighlighter.EnumGreen; FlagsDropdown.captionText.color = SignatureHighlighter.EnumGreen;
UIFactory.SetLayoutElement(flagsDrop, minHeight: 25, minWidth: 135, flexibleWidth: 999); UIFactory.SetLayoutElement(flagsDrop, minHeight: 25, minWidth: 135, flexibleWidth: 999);
if (hideFlagsValues == null) if (hideFlagsValues == null)
GetHideFlagNames(); GetHideFlagNames();
foreach (var name in hideFlagsValues.Keys) foreach (var name in hideFlagsValues.Keys)
FlagsDropdown.options.Add(new Dropdown.OptionData(name)); FlagsDropdown.options.Add(new Dropdown.OptionData(name));

8
src/UI/Inspectors/InspectUnderMouse.cs
View File

@ -68,8 +68,8 @@ namespace UnityExplorer.UI.Inspectors
{ {
MainCamera = Camera.main; MainCamera = Camera.main;
if (!MainCamera) if (!MainCamera)
return; return;
PanelDragger.ForceEnd(); PanelDragger.ForceEnd();
Mode = mode; Mode = mode;
@ -95,8 +95,8 @@ namespace UnityExplorer.UI.Inspectors
Inspecting = false; Inspecting = false;
UIManager.NavBarRect.gameObject.SetActive(true); UIManager.NavBarRect.gameObject.SetActive(true);
UIManager.PanelHolder.SetActive(true); UIManager.PanelHolder.SetActive(true);
var drop = UIManager.MouseInspectDropdown; var drop = UIManager.MouseInspectDropdown;
if (drop.transform.Find("Dropdown List") is Transform list) if (drop.transform.Find("Dropdown List") is Transform list)
drop.DestroyDropdownList(list.gameObject); drop.DestroyDropdownList(list.gameObject);

2
src/UI/Inspectors/InspectorManager.cs
View File

@ -87,7 +87,7 @@ namespace UnityExplorer
} }
} }
private static void CreateInspector<T>(object target, bool staticReflection = false, private static void CreateInspector<T>(object target, bool staticReflection = false,
CacheObjectBase sourceCache = null) where T : InspectorBase CacheObjectBase sourceCache = null) where T : InspectorBase
{ {
var inspector = Pool<T>.Borrow(); var inspector = Pool<T>.Borrow();

2
src/UI/Inspectors/InspectorTab.cs
View File

@ -33,7 +33,7 @@ namespace UnityExplorer.UI.Inspectors
public GameObject CreateContent(GameObject parent) public GameObject CreateContent(GameObject parent)
{ {
UIRoot = UIFactory.CreateHorizontalGroup(parent, "TabObject", false, true, true, true, 0, UIRoot = UIFactory.CreateHorizontalGroup(parent, "TabObject", false, true, true, true, 0,
default, new Color(0.13f, 0.13f, 0.13f), childAlignment: TextAnchor.MiddleLeft); default, new Color(0.13f, 0.13f, 0.13f), childAlignment: TextAnchor.MiddleLeft);
UIFactory.SetLayoutElement(UIRoot, minWidth: 200, flexibleWidth: 0); UIFactory.SetLayoutElement(UIRoot, minWidth: 200, flexibleWidth: 0);
UIRoot.AddComponent<Mask>(); UIRoot.AddComponent<Mask>();

15
src/UI/Inspectors/ReflectionInspector.cs
View File

@ -54,6 +54,7 @@ namespace UnityExplorer.UI.Inspectors
private readonly Color disabledButtonColor = new Color(0.24f, 0.24f, 0.24f); private readonly Color disabledButtonColor = new Color(0.24f, 0.24f, 0.24f);
private readonly Color enabledButtonColor = new Color(0.2f, 0.27f, 0.2f); private readonly Color enabledButtonColor = new Color(0.2f, 0.27f, 0.2f);
private readonly Dictionary<BindingFlags, ButtonRef> scopeFilterButtons = new Dictionary<BindingFlags, ButtonRef>(); private readonly Dictionary<BindingFlags, ButtonRef> scopeFilterButtons = new Dictionary<BindingFlags, ButtonRef>();
private readonly List<Toggle> memberTypeToggles = new List<Toggle>(); private readonly List<Toggle> memberTypeToggles = new List<Toggle>();
private InputFieldRef filterInputField; private InputFieldRef filterInputField;
@ -73,7 +74,6 @@ namespace UnityExplorer.UI.Inspectors
private IEnumerator InitCoroutine() private IEnumerator InitCoroutine()
{ {
yield return null; yield return null;
LayoutRebuilder.ForceRebuildLayoutImmediate(InspectorPanel.Instance.ContentRect); LayoutRebuilder.ForceRebuildLayoutImmediate(InspectorPanel.Instance.ContentRect);
} }
@ -142,7 +142,7 @@ namespace UnityExplorer.UI.Inspectors
// reset filters // reset filters
this.filterInputField.Text = ""; this.filterInputField.Text = "";
SetFilter("", StaticOnly ? BindingFlags.Static : BindingFlags.Instance); SetFilter("", StaticOnly ? BindingFlags.Static : BindingFlags.Instance);
scopeFilterButtons[BindingFlags.Default].Component.gameObject.SetActive(!StaticOnly); scopeFilterButtons[BindingFlags.Default].Component.gameObject.SetActive(!StaticOnly);
scopeFilterButtons[BindingFlags.Instance].Component.gameObject.SetActive(!StaticOnly); scopeFilterButtons[BindingFlags.Instance].Component.gameObject.SetActive(!StaticOnly);
@ -307,11 +307,8 @@ namespace UnityExplorer.UI.Inspectors
private void CalculateLayouts() private void CalculateLayouts()
{ {
// Calculate sizes LeftGroupWidth = (int)Math.Max(200, (0.4f * InspectorManager.PanelWidth) - 5);
LeftGroupWidth = (int)Math.Max(200, (0.4f * InspectorManager.PanelWidth) - 5);// Math.Min(450f, 0.4f * InspectorManager.PanelWidth - 5));
RightGroupWidth = (int)Math.Max(200, InspectorManager.PanelWidth - LeftGroupWidth - 65); RightGroupWidth = (int)Math.Max(200, InspectorManager.PanelWidth - LeftGroupWidth - 65);
//memberTitleLayout.minWidth = LeftGroupWidth;
} }
private void SetCellLayout(CacheObjectCell cell) private void SetCellLayout(CacheObjectCell cell)
@ -342,7 +339,7 @@ namespace UnityExplorer.UI.Inspectors
ConstructUnityObjectRow(); ConstructUnityObjectRow();
mainContentHolder = UIFactory.CreateVerticalGroup(UIRoot, "MemberHolder", false, false, true, true, 5, new Vector4(2,2,2,2), mainContentHolder = UIFactory.CreateVerticalGroup(UIRoot, "MemberHolder", false, false, true, true, 5, new Vector4(2, 2, 2, 2),
new Color(0.12f, 0.12f, 0.12f)); new Color(0.12f, 0.12f, 0.12f));
UIFactory.SetLayoutElement(mainContentHolder, flexibleWidth: 9999, flexibleHeight: 9999); UIFactory.SetLayoutElement(mainContentHolder, flexibleWidth: 9999, flexibleHeight: 9999);
@ -352,7 +349,7 @@ namespace UnityExplorer.UI.Inspectors
// Member scroll pool // Member scroll pool
var memberBorder = UIFactory.CreateVerticalGroup(mainContentHolder, "ScrollPoolHolder", false, false, true, true, padding: new Vector4(2,2,2,2), var memberBorder = UIFactory.CreateVerticalGroup(mainContentHolder, "ScrollPoolHolder", false, false, true, true, padding: new Vector4(2, 2, 2, 2),
bgColor: new Color(0.05f, 0.05f, 0.05f)); bgColor: new Color(0.05f, 0.05f, 0.05f));
UIFactory.SetLayoutElement(memberBorder, flexibleWidth: 9999, flexibleHeight: 9999); UIFactory.SetLayoutElement(memberBorder, flexibleWidth: 9999, flexibleHeight: 9999);
@ -546,7 +543,7 @@ namespace UnityExplorer.UI.Inspectors
textureButton.ButtonText.text = "Hide Texture"; textureButton.ButtonText.text = "Hide Texture";
} }
} }
// UI construction // UI construction
private void ConstructUnityObjectRow() private void ConstructUnityObjectRow()

4
src/UI/Models/InputFieldRef.cs
View File

@ -29,8 +29,8 @@ namespace UnityExplorer.UI
} }
} }
public InputFieldRef(InputField component) public InputFieldRef(InputField component)
{ {
this.Component = component; this.Component = component;
Rect = component.GetComponent<RectTransform>(); Rect = component.GetComponent<RectTransform>();
PlaceholderText = component.placeholder.TryCast<Text>(); PlaceholderText = component.placeholder.TryCast<Text>();

4
src/UI/ObjectExplorer/ObjectSearch.cs
View File

@ -25,7 +25,7 @@ namespace UnityExplorer.UI.ObjectExplorer
private ChildFilter m_childFilter = ChildFilter.Any; private ChildFilter m_childFilter = ChildFilter.Any;
private string desiredTypeInput; private string desiredTypeInput;
private string lastCheckedTypeInput; private string lastCheckedTypeInput;
private bool lastTypeCanHaveGO; private bool lastTypeCanHaveGO;
public ButtonListHandler<object, ButtonCell> dataHandler; public ButtonListHandler<object, ButtonCell> dataHandler;
@ -241,7 +241,7 @@ namespace UnityExplorer.UI.ObjectExplorer
// RESULTS SCROLL POOL // RESULTS SCROLL POOL
dataHandler = new ButtonListHandler<object, ButtonCell>(resultsScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked); dataHandler = new ButtonListHandler<object, ButtonCell>(resultsScrollPool, GetEntries, SetCell, ShouldDisplayCell, OnCellClicked);
resultsScrollPool = UIFactory.CreateScrollPool<ButtonCell>(uiRoot, "ResultsList", out GameObject scrollObj, resultsScrollPool = UIFactory.CreateScrollPool<ButtonCell>(uiRoot, "ResultsList", out GameObject scrollObj,
out GameObject scrollContent); out GameObject scrollContent);
resultsScrollPool.Initialize(dataHandler); resultsScrollPool.Initialize(dataHandler);

2
src/UI/ObjectExplorer/SceneExplorer.cs
View File

@ -201,7 +201,7 @@ namespace UnityExplorer.UI.ObjectExplorer
//Filter input field //Filter input field
var inputField = UIFactory.CreateInputField(filterRow, "FilterInput", "Search..."); var inputField = UIFactory.CreateInputField(filterRow, "FilterInput", "Search...");
inputField.Component.targetGraphic.color = new Color(0.2f, 0.2f, 0.2f); inputField.Component.targetGraphic.color = new Color(0.2f, 0.2f, 0.2f);
RuntimeProvider.Instance.SetColorBlock(inputField.Component, new Color(0.4f, 0.4f, 0.4f), new Color(0.2f, 0.2f, 0.2f), RuntimeProvider.Instance.SetColorBlock(inputField.Component, new Color(0.4f, 0.4f, 0.4f), new Color(0.2f, 0.2f, 0.2f),
new Color(0.08f, 0.08f, 0.08f)); new Color(0.08f, 0.08f, 0.08f));
UIFactory.SetLayoutElement(inputField.UIRoot, minHeight: 25); UIFactory.SetLayoutElement(inputField.UIRoot, minHeight: 25);
inputField.OnValueChanged += OnFilterInput; inputField.OnValueChanged += OnFilterInput;

4
src/UI/ObjectExplorer/SceneHandler.cs
View File

@ -13,7 +13,7 @@ namespace UnityExplorer.UI.ObjectExplorer
/// <summary> /// <summary>
/// The currently inspected Scene. /// The currently inspected Scene.
/// </summary> /// </summary>
public static Scene? SelectedScene public static Scene? SelectedScene
{ {
get => selectedScene; get => selectedScene;
internal set internal set
@ -93,7 +93,7 @@ namespace UnityExplorer.UI.ObjectExplorer
Type sceneUtil = ReflectionUtility.GetTypeByName("UnityEngine.SceneManagement.SceneUtility"); Type sceneUtil = ReflectionUtility.GetTypeByName("UnityEngine.SceneManagement.SceneUtility");
if (sceneUtil == null) if (sceneUtil == null)
throw new Exception("This version of Unity does not ship with the 'SceneUtility' class, or it was not unstripped."); throw new Exception("This version of Unity does not ship with the 'SceneUtility' class, or it was not unstripped.");
var method = sceneUtil.GetMethod("GetScenePathByBuildIndex", ReflectionUtility.FLAGS); var method = sceneUtil.GetMethod("GetScenePathByBuildIndex", ReflectionUtility.FLAGS);
int sceneCount = SceneManager.sceneCountInBuildSettings; int sceneCount = SceneManager.sceneCountInBuildSettings;
for (int i = 0; i < sceneCount; i++) for (int i = 0; i < sceneCount; i++)

4
src/UI/ObjectExplorer/SearchProvider.cs
View File

@ -35,7 +35,7 @@ namespace UnityExplorer.UI.ObjectExplorer
public static class SearchProvider public static class SearchProvider
{ {
private static bool Filter(Scene scene, SceneFilter filter) private static bool Filter(Scene scene, SceneFilter filter)
{ {
switch (filter) switch (filter)
@ -53,7 +53,7 @@ namespace UnityExplorer.UI.ObjectExplorer
} }
} }
internal static List<object> UnityObjectSearch(string input, string customTypeInput, SearchContext context, internal static List<object> UnityObjectSearch(string input, string customTypeInput, SearchContext context,
ChildFilter childFilter, SceneFilter sceneFilter) ChildFilter childFilter, SceneFilter sceneFilter)
{ {
var results = new List<object>(); var results = new List<object>();

2
src/UI/Panels/InspectorPanel.cs
View File

@ -61,7 +61,7 @@ namespace UnityExplorer.UI.Panels
{ {
// add close all button to titlebar // add close all button to titlebar
var closeAllBtn = UIFactory.CreateButton(this.titleBar.transform.Find("CloseHolder").gameObject, "CloseAllBtn", "Close All", var closeAllBtn = UIFactory.CreateButton(this.titleBar.transform.Find("CloseHolder").gameObject, "CloseAllBtn", "Close All",
new Color(0.3f, 0.2f, 0.2f)); new Color(0.3f, 0.2f, 0.2f));
UIFactory.SetLayoutElement(closeAllBtn.Component.gameObject, minHeight: 25, minWidth: 80); UIFactory.SetLayoutElement(closeAllBtn.Component.gameObject, minHeight: 25, minWidth: 80);
closeAllBtn.Component.transform.SetSiblingIndex(closeAllBtn.Component.transform.GetSiblingIndex() - 1); closeAllBtn.Component.transform.SetSiblingIndex(closeAllBtn.Component.transform.GetSiblingIndex() - 1);

10
src/UI/Panels/PanelDragger.cs
View File

@ -1,17 +1,17 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityExplorer.Core.Input; using UnityExplorer.Core.Input;
using System.IO;
using System.Diagnostics;
using UnityExplorer.UI.Models; using UnityExplorer.UI.Models;
using System.Linq;
using UnityExplorer.UI.Widgets.AutoComplete; using UnityExplorer.UI.Widgets.AutoComplete;
namespace UnityExplorer.UI.Panels namespace UnityExplorer.UI.Panels
{ {
public class PanelDragger public class PanelDragger
{ {
#region Static #region Static
@ -137,7 +137,7 @@ namespace UnityExplorer.UI.Panels
Instances.Add(this); Instances.Add(this);
DragableArea = dragArea; DragableArea = dragArea;
Panel = panelToDrag; Panel = panelToDrag;
if (!canvasTransform) if (!canvasTransform)
canvasTransform = Panel.GetComponentInParent<Canvas>().GetComponent<RectTransform>(); canvasTransform = Panel.GetComponentInParent<Canvas>().GetComponent<RectTransform>();

6
src/UI/Panels/UIPanel.cs
View File

@ -146,17 +146,17 @@ namespace UnityExplorer.UI.Panels
if (Rect.rect.height < MinHeight) if (Rect.rect.height < MinHeight)
Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, MinHeight); Rect.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, MinHeight);
} }
public static void EnsureValidPosition(RectTransform panel) public static void EnsureValidPosition(RectTransform panel)
{ {
var pos = panel.localPosition; var pos = panel.localPosition;
// Prevent panel going oustide screen bounds // Prevent panel going oustide screen bounds
var halfW = Screen.width * 0.5f; var halfW = Screen.width * 0.5f;
var halfH = Screen.height * 0.5f; var halfH = Screen.height * 0.5f;
pos.x = Math.Max(-halfW, Math.Min(pos.x, halfW - panel.rect.width)); pos.x = Math.Max(-halfW, Math.Min(pos.x, halfW - panel.rect.width));
pos.y = Math.Max(-halfH + panel.rect.height, Math.Min(pos.y, halfH)); pos.y = Math.Max(-halfH + panel.rect.height, Math.Min(pos.y, halfH));
panel.localPosition = pos; panel.localPosition = pos;
} }

22
src/UI/UIFactory.cs
View File

@ -419,7 +419,7 @@ namespace UnityExplorer.UI
toggle = toggleObj.AddComponent<Toggle>(); toggle = toggleObj.AddComponent<Toggle>();
toggle.isOn = true; toggle.isOn = true;
// second reference so we can use it inside the lambda, 'toggle' is an out var. // second reference so we can use it inside the lambda, 'toggle' is an out var.
Toggle toggleComp = toggle; Toggle toggleComp = toggle;
toggle.onValueChanged.AddListener(Deselect); toggle.onValueChanged.AddListener(Deselect);
@ -729,7 +729,7 @@ namespace UnityExplorer.UI
var sliderContainer = CreateVerticalGroup(mainObj, "SliderContainer", var sliderContainer = CreateVerticalGroup(mainObj, "SliderContainer",
false, false, true, true, 0, default, new Color(0.05f, 0.05f, 0.05f)); false, false, true, true, 0, default, new Color(0.05f, 0.05f, 0.05f));
SetLayoutElement(sliderContainer, minWidth: 25, flexibleWidth:0, flexibleHeight: 9999); SetLayoutElement(sliderContainer, minWidth: 25, flexibleWidth: 0, flexibleHeight: 9999);
sliderContainer.AddComponent<Mask>(); sliderContainer.AddComponent<Mask>();
CreateSliderScrollbar(sliderContainer, out Slider slider); CreateSliderScrollbar(sliderContainer, out Slider slider);
@ -837,7 +837,7 @@ namespace UnityExplorer.UI
content.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize; content.AddComponent<ContentSizeFitter>().verticalFit = ContentSizeFitter.FitMode.PreferredSize;
// Slider // Slider
GameObject scrollBarObj = CreateUIObject("AutoSliderScrollbar", mainObj); GameObject scrollBarObj = CreateUIObject("AutoSliderScrollbar", mainObj);
var scrollBarRect = scrollBarObj.GetComponent<RectTransform>(); var scrollBarRect = scrollBarObj.GetComponent<RectTransform>();
scrollBarRect.anchorMin = new Vector2(1, 0); scrollBarRect.anchorMin = new Vector2(1, 0);
@ -846,22 +846,22 @@ namespace UnityExplorer.UI
SetLayoutGroup<VerticalLayoutGroup>(scrollBarObj, false, true, true, true); SetLayoutGroup<VerticalLayoutGroup>(scrollBarObj, false, true, true, true);
scrollBarObj.AddComponent<Image>().color = Color.white; scrollBarObj.AddComponent<Image>().color = Color.white;
scrollBarObj.AddComponent<Mask>().showMaskGraphic = false; scrollBarObj.AddComponent<Mask>().showMaskGraphic = false;
GameObject hiddenBar = CreateScrollbar(scrollBarObj, "HiddenScrollviewScroller", out var hiddenScrollbar); GameObject hiddenBar = CreateScrollbar(scrollBarObj, "HiddenScrollviewScroller", out var hiddenScrollbar);
hiddenScrollbar.SetDirection(Scrollbar.Direction.BottomToTop, true); hiddenScrollbar.SetDirection(Scrollbar.Direction.BottomToTop, true);
for (int i = 0; i < hiddenBar.transform.childCount; i++) for (int i = 0; i < hiddenBar.transform.childCount; i++)
{ {
var child = hiddenBar.transform.GetChild(i); var child = hiddenBar.transform.GetChild(i);
child.gameObject.SetActive(false); child.gameObject.SetActive(false);
} }
CreateSliderScrollbar(scrollBarObj, out Slider scrollSlider); CreateSliderScrollbar(scrollBarObj, out Slider scrollSlider);
autoScrollbar = new AutoSliderScrollbar(hiddenScrollbar, scrollSlider, contentRect, viewportRect); autoScrollbar = new AutoSliderScrollbar(hiddenScrollbar, scrollSlider, contentRect, viewportRect);
// Set up the ScrollRect component // Set up the ScrollRect component
var scrollRect = mainObj.AddComponent<ScrollRect>(); var scrollRect = mainObj.AddComponent<ScrollRect>();
scrollRect.horizontal = false; scrollRect.horizontal = false;
scrollRect.vertical = true; scrollRect.vertical = true;
@ -870,10 +870,10 @@ namespace UnityExplorer.UI
scrollRect.scrollSensitivity = 35; scrollRect.scrollSensitivity = 35;
scrollRect.horizontalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport; scrollRect.horizontalScrollbarVisibility = ScrollRect.ScrollbarVisibility.AutoHideAndExpandViewport;
scrollRect.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.Permanent; scrollRect.verticalScrollbarVisibility = ScrollRect.ScrollbarVisibility.Permanent;
scrollRect.viewport = viewportRect; scrollRect.viewport = viewportRect;
scrollRect.content = contentRect; scrollRect.content = contentRect;
return mainObj; return mainObj;
} }

2
src/UI/UIManager.cs
View File

@ -352,7 +352,7 @@ namespace UnityExplorer.UI
NavbarAnchor = ConfigManager.Main_Navbar_Anchor.Value; NavbarAnchor = ConfigManager.Main_Navbar_Anchor.Value;
SetNavBarAnchor(); SetNavBarAnchor();
ConfigManager.Main_Navbar_Anchor.OnValueChanged += (VerticalAnchor val) => ConfigManager.Main_Navbar_Anchor.OnValueChanged += (VerticalAnchor val) =>
{ {
NavbarAnchor = val; NavbarAnchor = val;
SetNavBarAnchor(); SetNavBarAnchor();

6
src/UI/Widgets/AutoComplete/AutoCompleteModal.cs
View File

@ -169,7 +169,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
// Setting autocomplete cell buttons // Setting autocomplete cell buttons
private readonly Color selectedSuggestionColor = new Color(45/255f, 75/255f, 80/255f); private readonly Color selectedSuggestionColor = new Color(45 / 255f, 75 / 255f, 80 / 255f);
private readonly Color inactiveSuggestionColor = new Color(0.11f, 0.11f, 0.11f); private readonly Color inactiveSuggestionColor = new Color(0.11f, 0.11f, 0.11f);
private List<Suggestion> GetEntries() => Suggestions; private List<Suggestion> GetEntries() => Suggestions;
@ -300,7 +300,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
{ {
dataHandler = new ButtonListHandler<Suggestion, ButtonCell>(scrollPool, GetEntries, SetCell, ShouldDisplay, OnCellClicked); dataHandler = new ButtonListHandler<Suggestion, ButtonCell>(scrollPool, GetEntries, SetCell, ShouldDisplay, OnCellClicked);
scrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.content, "AutoCompleter", out GameObject scrollObj, scrollPool = UIFactory.CreateScrollPool<ButtonCell>(this.content, "AutoCompleter", out GameObject scrollObj,
out GameObject scrollContent); out GameObject scrollContent);
scrollPool.Initialize(dataHandler); scrollPool.Initialize(dataHandler);
UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999); UIFactory.SetLayoutElement(scrollObj, flexibleHeight: 9999);
@ -308,7 +308,7 @@ namespace UnityExplorer.UI.Widgets.AutoComplete
navigationTipRow = UIFactory.CreateHorizontalGroup(this.content, "BottomRow", true, true, true, true, 0, new Vector4(2, 2, 2, 2)); navigationTipRow = UIFactory.CreateHorizontalGroup(this.content, "BottomRow", true, true, true, true, 0, new Vector4(2, 2, 2, 2));
UIFactory.SetLayoutElement(navigationTipRow, minHeight: 20, flexibleWidth: 9999); UIFactory.SetLayoutElement(navigationTipRow, minHeight: 20, flexibleWidth: 9999);
UIFactory.CreateLabel(navigationTipRow, "HelpText", "Up/Down to select, Enter to use, Esc to close", UIFactory.CreateLabel(navigationTipRow, "HelpText", "Up/Down to select, Enter to use, Esc to close",
TextAnchor.MiddleLeft, Color.grey, false, 13); TextAnchor.MiddleLeft, Color.grey, false, 13);
UIRoot.SetActive(false); UIRoot.SetActive(false);

2
src/UI/Widgets/AutoSliderScrollbar.cs
View File

@ -91,7 +91,7 @@ namespace UnityExplorer.UI.Widgets
Slider.interactable = false; Slider.interactable = false;
return; return;
} }
var handleHeight = viewportHeight * Math.Min(1, viewportHeight / totalHeight); var handleHeight = viewportHeight * Math.Min(1, viewportHeight / totalHeight);
handleHeight = Math.Max(15f, handleHeight); handleHeight = Math.Max(15f, handleHeight);

2
src/UI/Widgets/ButtonList/ButtonListHandler.cs
View File

@ -26,7 +26,7 @@ namespace UnityExplorer.UI.Widgets
} }
private string currentFilter; private string currentFilter;
public ButtonListHandler(ScrollPool<TCell> scrollPool, Func<List<TData>> getEntriesMethod, public ButtonListHandler(ScrollPool<TCell> scrollPool, Func<List<TData>> getEntriesMethod,
Action<TCell, int> setICellMethod, Func<TData, string, bool> shouldDisplayMethod, Action<TCell, int> setICellMethod, Func<TData, string, bool> shouldDisplayMethod,
Action<int> onCellClickedMethod) Action<int> onCellClickedMethod)
{ {

4
src/UI/Widgets/InputFieldScroller.cs
View File

@ -4,9 +4,9 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
using UnityEngine.EventSystems;
using UnityEngine.Events; using UnityEngine.Events;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using UnityExplorer.UI.Models; using UnityExplorer.UI.Models;
namespace UnityExplorer.UI.Widgets namespace UnityExplorer.UI.Widgets

2
src/UI/Widgets/ScrollPool/DataHeightCache.cs
View File

@ -118,7 +118,7 @@ namespace UnityExplorer.UI.Widgets
if (!heightCache.Any()) if (!heightCache.Any())
return; return;
totalHeight -= heightCache[heightCache.Count - 1]; totalHeight -= heightCache[heightCache.Count - 1];
heightCache.RemoveAt(heightCache.Count - 1); heightCache.RemoveAt(heightCache.Count - 1);
int idx = heightCache.Count; int idx = heightCache.Count;

6
src/UI/Widgets/ScrollPool/ScrollPool.cs
View File

@ -11,7 +11,7 @@ using UnityExplorer.UI.Panels;
namespace UnityExplorer.UI.Widgets namespace UnityExplorer.UI.Widgets
{ {
public struct CellInfo public struct CellInfo
{ {
public int cellIndex, dataIndex; public int cellIndex, dataIndex;
} }
@ -120,7 +120,7 @@ namespace UnityExplorer.UI.Widgets
OnHeightChanged?.Invoke(); OnHeightChanged?.Invoke();
} }
} }
} }
#endregion #endregion
@ -129,7 +129,7 @@ namespace UnityExplorer.UI.Widgets
public void Refresh(bool setCellData, bool jumpToTop = false) public void Refresh(bool setCellData, bool jumpToTop = false)
{ {
if (jumpToTop) if (jumpToTop)
{ {
bottomDataIndex = CellPool.Count - 1; bottomDataIndex = CellPool.Count - 1;
Content.anchoredPosition = Vector2.zero; Content.anchoredPosition = Vector2.zero;
} }

8
src/UI/Widgets/TransformTree/CachedTransform.cs
View File

@ -33,10 +33,10 @@ namespace UnityExplorer.UI.Widgets
{ {
bool ret = false; bool ret = false;
if (Value != transform if (Value != transform
|| depth != Depth || depth != Depth
|| ChildCount != transform.childCount || ChildCount != transform.childCount
|| Name != transform.name || Name != transform.name
|| Enabled != transform.gameObject.activeSelf) || Enabled != transform.gameObject.activeSelf)
{ {
Value = transform; Value = transform;