.github/FUNDING.yml

@@ -1,5 +1 @@
 
-ko_fi: neonage
-patreon: neonage
-
-custom: paypal.me/neonage

AV.Inspector.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "AV.Inspector",
     "rootNamespace": "AV.Inspector",
-    "references": [],
+    "references": [
+        "GUID:5bfd80592c1d75544a34ca5910633008"
+    ],
     "includePlatforms": [
         "Editor"
     ],

Base/Elements/InspectorEditorTab.cs → Base/Elements/InspectorTab.cs

@@ -1,15 +1,18 @@
 using System;
 using System.Threading.Tasks;
+using AV.Inspector.Runtime;
+using AV.UITK;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEditorInternal;
 using UnityEngine;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
+using EditorElement = AV.Inspector.Runtime.SmartInspector.EditorElement;
 
 namespace AV.Inspector
 {
-    internal class InspectorEditorTab : ToolbarToggle
+    internal class InspectorTab : ToolbarToggle
     {
         const string EditorTabClass = "editor-tab";
         const string TabStateKeyPrefix = "tab ";
@@ -22,25 +25,24 @@ public enum State
             WasExpanded = 2, // Was inspector expanded before tab activation?
         }
 
-        public readonly SmartInspector.EditorElement editor;
+        public readonly EditorElement editor;
 
-        readonly SmartInspector inspector = SmartInspector.LastInjected;
+        readonly SmartInspector inspector = SmartInspector.RebuildingInspector;
         readonly ActiveEditorTracker tracker;
 
         Texture2D preview;
         Texture2D thumbnail;
-        VisualElement image;
-        
+        FluentUITK.Icon icon;
+
         Object target => editor.target;
 
 
-        public InspectorEditorTab(SmartInspector.EditorElement editor)
+        public InspectorTab(EditorElement editor)
         {
             this.editor = editor;
             this.tracker = PropertyEditorRef.GetTracker(inspector.propertyEditor);
 
             name = GetTitle();
-            //tooltip = GetTitle();
             RestoreTabState();
 
             AddToClassList(EditorTabClass);
@@ -51,10 +53,10 @@ public InspectorEditorTab(SmartInspector.EditorElement editor)
             preview = AssetPreview.GetAssetPreview(target);
             thumbnail = AssetPreview.GetMiniThumbnail(target);
 
-            image = new VisualElement() { pickingMode = PickingMode.Ignore }.AddClass("small-icon");
-            Add(image);
+            icon = new FluentUITK.Icon();
+            Add(icon);
 
-            this.Get(".unity-toggle__input").RemoveFromHierarchy();
+            this.Query(className: "unity-toggle__input").First().RemoveFromHierarchy();
         }
 
         void RegisterCallbacks()
@@ -140,17 +142,28 @@ void OnGeometryChange(GeometryChangedEvent evt)
             if (!preview)
                 preview = AssetPreview.GetAssetPreview(target);
 
-            image.style.backgroundImage = preview ? preview : thumbnail;
+            icon.image = preview ? preview : thumbnail;
+        }
+
+
+        string GetStateLog()
+        {
+            return $"{LoadState()} {GetPrefKey()}";
         }
 
         string GetPrefKey()
         {
-            string key;
-            // Save state by guid for assets (usually Materials)
-            if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(target, out var guid, out long localId))
-                key = guid;
-            else // And by full type name for scene objects
+            string key = "";
+
+            if (target is Component)
+            {
                 key = target.GetType().FullName;
+            }
+            // Use guid for assets (usually Materials)
+            else if (AssetDatabase.TryGetGUIDAndLocalFileIdentifier(target, out var guid, out long localId))
+            {
+                key = guid;
+            }
 
             return TabStateKeyPrefix + key;
         }