Namespace/structure cleanup

2025-07-15 07:56:41 +08:00 · 2021-05-26 17:40:09 +10:00
parent c8899be3ae
commit cb8e947fdf
38 changed files with 40 additions and 242 deletions
--- a/src/UI/CacheObject/CacheKeyValuePair.cs
+++ b/src/UI/CacheObject/CacheKeyValuePair.cs
@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.IValues;
-using UnityExplorer.UI.Utility;
+using UnityExplorer.UI.CacheObject.IValues;

 namespace UnityExplorer.UI.CacheObject
 {
--- a/src/UI/CacheObject/CacheListEntry.cs
+++ b/src/UI/CacheObject/CacheListEntry.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.IValues;
+using UnityExplorer.UI.CacheObject.IValues;

 namespace UnityExplorer.UI.CacheObject
 {
--- a/src/UI/CacheObject/CacheMember.cs
+++ b/src/UI/CacheObject/CacheMember.cs
@ -7,8 +7,7 @@ using UnityEngine;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.ObjectPool;
-using UnityExplorer.UI.Utility;
+using UnityExplorer.UI.Models;

 namespace UnityExplorer.UI.CacheObject
 {
--- a/src/UI/CacheObject/CacheObjectBase.cs
+++ b/src/UI/CacheObject/CacheObjectBase.cs
@ -8,9 +8,8 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.IValues;
-using UnityExplorer.UI.ObjectPool;
-using UnityExplorer.UI.Utility;
+using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.UI.Models;

 namespace UnityExplorer.UI.CacheObject
 {
--- a/src/UI/CacheObject/IValues/InteractiveColor.cs
+++ b/src/UI/CacheObject/IValues/InteractiveColor.cs
@ -6,7 +6,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI.CacheObject;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public class InteractiveColor : InteractiveValue
    {
--- a/src/UI/CacheObject/IValues/InteractiveDictionary.cs
+++ b/src/UI/CacheObject/IValues/InteractiveDictionary.cs
@ -9,10 +9,9 @@ using UnityExplorer.UI.CacheObject;
 using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public class InteractiveDictionary : InteractiveValue, ICellPoolDataSource<CacheKeyValuePairCell>, ICacheObjectController
    {
--- a/src/UI/CacheObject/IValues/InteractiveEnum.cs
+++ b/src/UI/CacheObject/IValues/InteractiveEnum.cs
@ -7,7 +7,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI.CacheObject;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public class InteractiveEnum : InteractiveValue
    {
--- a/src/UI/CacheObject/IValues/InteractiveList.cs
+++ b/src/UI/CacheObject/IValues/InteractiveList.cs
@ -9,10 +9,9 @@ using UnityExplorer.UI.CacheObject;
 using UnityExplorer.UI.CacheObject.Views;
 using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public class InteractiveList : InteractiveValue, ICellPoolDataSource<CacheListEntryCell>, ICacheObjectController
    {
--- a/src/UI/CacheObject/IValues/InteractiveString.cs
+++ b/src/UI/CacheObject/IValues/InteractiveString.cs
@ -9,7 +9,7 @@ using UnityExplorer.Core.Config;
 using UnityExplorer.UI.CacheObject;
 using UnityExplorer.UI.Widgets;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public class InteractiveString : InteractiveValue
    {
--- a/src/UI/CacheObject/IValues/InteractiveValue.cs
+++ b/src/UI/CacheObject/IValues/InteractiveValue.cs
@ -5,9 +5,9 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.ObjectPool;
+using UnityExplorer.UI.Models;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public abstract class InteractiveValue : IPooledObject
    {
--- a/src/UI/CacheObject/IValues/InteractiveValueStruct.cs
+++ b/src/UI/CacheObject/IValues/InteractiveValueStruct.cs
@ -6,9 +6,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.Utility;

-namespace UnityExplorer.UI.IValues
+namespace UnityExplorer.UI.CacheObject.IValues
 {
    public class InteractiveValueStruct : InteractiveValue
    {
--- a/src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
+++ b/src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
@ -5,7 +5,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.IValues;
+using UnityExplorer.UI.CacheObject.IValues;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.CacheObject.Views
--- a/src/UI/CacheObject/Views/CacheListEntryCell.cs
+++ b/src/UI/CacheObject/Views/CacheListEntryCell.cs
@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.IValues;
+using UnityExplorer.UI.CacheObject.IValues;

 namespace UnityExplorer.UI.CacheObject.Views
 {
--- a/src/UI/CacheObject/Views/CacheObjectCell.cs
+++ b/src/UI/CacheObject/Views/CacheObjectCell.cs
@ -5,9 +5,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.IValues;
-using UnityExplorer.UI.ObjectPool;
-using UnityExplorer.UI.Utility;
+using UnityExplorer.UI.CacheObject.IValues;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.CacheObject.Views
--- a/src/UI/CacheObject/Views/EvaluateWidget.cs
+++ b/src/UI/CacheObject/Views/EvaluateWidget.cs
@ -5,8 +5,7 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.ObjectPool;
-using UnityExplorer.UI.Utility;
+using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Widgets.AutoComplete;

 namespace UnityExplorer.UI.CacheObject.Views
--- a/src/UI/Inspectors/GameObjectInspector.cs
+++ b/src/UI/Inspectors/GameObjectInspector.cs
@ -6,9 +6,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
-using UnityExplorer.UI.ObjectPool;
+using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;

@ -221,8 +220,8 @@ namespace UnityExplorer.UI.Inspectors

        public override GameObject CreateContent(GameObject parent)
        {
-            UIRoot = UIFactory.CreateVerticalGroup(Pool<GameObjectInspector>.Instance.InactiveHolder,
-                "GameObjectInspector", true, false, true, true, 5, new Vector4(4, 4, 4, 4), new Color(0.065f, 0.065f, 0.065f));
+            UIRoot = UIFactory.CreateVerticalGroup(parent, "GameObjectInspector", true, false, true, true, 5, 
+                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, 
                new Color(0.065f, 0.065f, 0.065f));
--- a/src/UI/Inspectors/InspectorBase.cs
+++ b/src/UI/Inspectors/InspectorBase.cs
@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.ObjectPool;
+using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;

 namespace UnityExplorer.UI.Inspectors
--- a/src/UI/Inspectors/InspectorManager.cs
+++ b/src/UI/Inspectors/InspectorManager.cs
@ -7,7 +7,7 @@ using UnityEngine.UI;
 using UnityExplorer.UI;
 using UnityExplorer.UI.CacheObject;
 using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.ObjectPool;
+using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;

 namespace UnityExplorer
--- a/src/UI/Inspectors/InspectorTab.cs
+++ b/src/UI/Inspectors/InspectorTab.cs
@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.ObjectPool;
+using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.Inspectors
--- a/src/UI/Inspectors/ReflectionInspector.cs
+++ b/src/UI/Inspectors/ReflectionInspector.cs
@ -12,9 +12,7 @@ using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.CacheObject;
 using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.ObjectPool;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.Inspectors
--- a/src/UI/Models/ObjectPool/IPooledObject.cs
+++ b/src/UI/Models/ObjectPool/IPooledObject.cs
@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;

-namespace UnityExplorer.UI.ObjectPool
+namespace UnityExplorer.UI.Models
 {
    public interface IPooledObject
    {
--- a/src/UI/Models/ObjectPool/Pool.cs
+++ b/src/UI/Models/ObjectPool/Pool.cs
@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;

-namespace UnityExplorer.UI.ObjectPool
+namespace UnityExplorer.UI.Models
 {
    // Abstract non-generic class, handles the pool dictionary and interfacing with the generic pools.
    public abstract class Pool
--- a/src/UI/ObjectExplorer/ObjectSearch.cs
+++ b/src/UI/ObjectExplorer/ObjectSearch.cs
@ -4,11 +4,8 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Models;
-using UnityExplorer.UI.ObjectPool;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;

--- a/src/UI/Panels/CSConsolePanel.cs
+++ b/src/UI/Panels/CSConsolePanel.cs
@ -7,7 +7,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.UI.CSConsole;
-using UnityExplorer.UI.Utility;
+using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.Panels
 {
--- a/src/UI/Panels/ObjectExplorerPanel.cs
+++ b/src/UI/Panels/ObjectExplorerPanel.cs
@ -12,7 +12,6 @@ using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.ObjectExplorer;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.Panels
--- a/src/UI/Panels/UIPanel.cs
+++ b/src/UI/Panels/UIPanel.cs
@ -8,7 +8,6 @@ using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
 using UnityExplorer.UI.Models;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.Panels
--- a/src/UI/UIFactory.cs
+++ b/src/UI/UIFactory.cs
@ -5,7 +5,6 @@ using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.Models;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI
--- a/src/UI/UIManager.cs
+++ b/src/UI/UIManager.cs
@ -12,7 +12,6 @@ using UnityExplorer.UI.CSConsole;
 using UnityExplorer.UI.Inspectors;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;

--- a/src/UI/Widgets/AutoComplete/AutoCompleteModal.cs
+++ b/src/UI/Widgets/AutoComplete/AutoCompleteModal.cs
@ -7,7 +7,6 @@ using UnityEngine.UI;
 using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI;
-using UnityExplorer.UI.ObjectPool;
 using UnityExplorer.UI.Panels;

 namespace UnityExplorer.UI.Widgets.AutoComplete
--- a/src/UI/Widgets/AutoComplete/TypeCompleter.cs
+++ b/src/UI/Widgets/AutoComplete/TypeCompleter.cs
@ -9,7 +9,6 @@ using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
-using UnityExplorer.UI.Utility;

 namespace UnityExplorer.UI.Widgets.AutoComplete
 {
--- a/src/UI/Widgets/AutoSliderScrollbar.cs
+++ b/src/UI/Widgets/AutoSliderScrollbar.cs
@ -10,7 +10,7 @@ using UnityExplorer.Core;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Models;

-namespace UnityExplorer.UI.Utility
+namespace UnityExplorer.UI.Widgets
 {
    public class AutoSliderScrollbar : UIBehaviourModel
    {
--- a/src/UI/Widgets/ButtonList/ButtonCell.cs
+++ b/src/UI/Widgets/ButtonList/ButtonCell.cs
@ -4,7 +4,6 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.ObjectPool;

 namespace UnityExplorer.UI.Widgets
 {
--- a/src/UI/Widgets/ButtonList/ButtonListHandler.cs
+++ b/src/UI/Widgets/ButtonList/ButtonListHandler.cs
@ -4,9 +4,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityEngine.UI;
-using UnityExplorer.UI.ObjectPool;
-using UnityExplorer.UI.Widgets;

 namespace UnityExplorer.UI.Widgets
 {
--- a/src/UI/Widgets/InputFieldScroller.cs
+++ b/src/UI/Widgets/InputFieldScroller.cs
@ -9,7 +9,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.Events;
 using UnityExplorer.UI.Models;

-namespace UnityExplorer.UI.Utility
+namespace UnityExplorer.UI.Widgets
 {
    // To fix an issue with Input Fields and allow them to go inside a ScrollRect nicely.

--- a/src/UI/Widgets/ScrollPool/ICell.cs
+++ b/src/UI/Widgets/ScrollPool/ICell.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.ObjectPool;
+using UnityExplorer.UI.Models;

 namespace UnityExplorer.UI.Widgets
 {