fix: minor fixes to error report UI (#237)

Closes: #232
bdunderscore · May 12, 2024 · 73a40ed · 73a40ed
1 parent 960805b
commit 73a40ed
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Workaround VRCSDK bug where stale PhysBones state could be retained over play mode transitions (#231) 
 - Show object name when we're unable to find the actual GameObject, in error display UI (#224)
+- Rerender error report window when leaving play mode (#237)
+- Deduplicate object references in NDMF console error reports (#237)
 
 ### Changed
 - Renamed `NDMF Error Report` to `NDMF Console` (#222)

diff --git a/Editor/ErrorReporting/UI/ErrorReportWindow.cs b/Editor/ErrorReporting/UI/ErrorReportWindow.cs
@@ -1,25 +1,20 @@
 #region
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using nadena.dev.ndmf.localization;
 using nadena.dev.ndmf.runtime;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
-using UnityEngine.SceneManagement;
 using UnityEngine.UIElements;
-using Object = UnityEngine.Object;
 
 #endregion
 
 namespace nadena.dev.ndmf.ui
 {
     #region
 
-    using UnityObject = Object;
-
     #endregion
 
     // Note: Due to historical reason, "NDMF Console" is internally called "Error Report".
@@ -147,11 +142,23 @@ private void OnEnable()
                 // GUI setup done
                 EditorApplication.hierarchyChanged += SetupSelector;
             }
+
+            EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
         }
 
         private void OnDisable()
         {
             EditorApplication.hierarchyChanged -= SetupSelector;
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
+        }
+
+        private void OnPlayModeStateChanged(PlayModeStateChange state)
+        {
+            if (_testBuild != null && state == PlayModeStateChange.EnteredEditMode)
+            {
+                // Rerender error UI in case we can now find objects that had moved during processing...
+                UpdateContents();
+            }
         }
 
         private void OnSelectionChange()

diff --git a/Editor/ErrorReporting/UI/SimpleErrorUI.cs b/Editor/ErrorReporting/UI/SimpleErrorUI.cs
@@ -1,5 +1,6 @@
 #region
 
+using System.Collections.Generic;
 using nadena.dev.ndmf.localization;
 using UnityEditor;
 using UnityEngine.UIElements;
@@ -88,8 +89,12 @@ private void RenderContent()
             }
             else
             {
+                HashSet<ObjectReference> _refs = new HashSet<ObjectReference>();
                 foreach (var objRef in _error.References)
                 {
+                    // dedup refs
+                    if (!_refs.Add(objRef)) continue;
+
                     if (ObjectSelector.TryCreate(_report, objRef, out var selector))
                     {
                         objRefs.Add(selector);