Allow multiple un/loadTrigger attributes, use action to trigger repaints

Author: rogerbarton

scripts/DllManipulator.cs

@@ -81,17 +81,16 @@ internal static void Initialize(int unityMainThreadId, string assetsPath)
                             if (Options.mockAllNativeFunctions || method.IsDefined(typeof(MockNativeDeclarationAttribute)) || method.DeclaringType.IsDefined(typeof(MockNativeDeclarationsAttribute)))
                                 MockNativeFunction(method);
                         }
-                        else if(method.IsDefined(typeof(NativeDllLoadedTriggerAttribute)))
+                        else
                         {
-                            RegisterTriggerMethod(method, ref _customLoadedTriggers);
-                        }
-                        else if (method.IsDefined(typeof(NativeDllBeforeUnloadTriggerAttribute)))
-                        {
-                            RegisterTriggerMethod(method, ref _customBeforeUnloadTriggers);
-                        }
-                        else if (method.IsDefined(typeof(NativeDllAfterUnloadTriggerAttribute)))
-                        {
-                            RegisterTriggerMethod(method, ref _customAfterUnloadTriggers);
+                            if (method.IsDefined(typeof(NativeDllLoadedTriggerAttribute)))
+                                RegisterTriggerMethod(method, ref _customLoadedTriggers);
+
+                            if (method.IsDefined(typeof(NativeDllBeforeUnloadTriggerAttribute)))
+                                RegisterTriggerMethod(method, ref _customBeforeUnloadTriggers);
+
+                            if (method.IsDefined(typeof(NativeDllAfterUnloadTriggerAttribute)))
+                                RegisterTriggerMethod(method, ref _customAfterUnloadTriggers);
                         }
                     }
                 }

scripts/Editor/DllManipulatorEditor.cs

@@ -61,11 +61,14 @@ public class DllManipulatorEditor : Editor
         private bool _showTargetAssemblies = true;
         private string[] _allKnownAssemblies = null;
         private DateTime _lastKnownAssembliesRefreshTime;
-
+        
+        public static event Action RepaintAllEditors = delegate {};
+        
         public DllManipulatorEditor()
         {
             EditorApplication.pauseStateChanged += _ => Repaint();
             EditorApplication.playModeStateChanged += _ => Repaint();
+            RepaintAllEditors += Repaint;
         }
 
         public override void OnInspectorGUI()
@@ -346,10 +349,7 @@ public static void UnloadAll()
         [NativeDllAfterUnloadTrigger]
         public static void RepaintAll()
         {
-            var editors = Resources.FindObjectsOfTypeAll<DllManipulatorEditor>();
-            if(editors == null) return;
-            foreach (var editor in editors)
-                editor.Repaint();
+            RepaintAllEditors.Invoke();
         }
     }
 }

scripts/Editor/DllManipulatorWindowEditor.cs

@@ -13,13 +13,7 @@ static void Init()
         {
             window = GetWindow<DllManipulatorWindowEditor>();
             window.Show();
-        }
-
-        [NativeDllLoadedTrigger]
-        [NativeDllAfterUnloadTrigger]
-        public static void RepaintAll()
-        {
-            if(window) window.Repaint();
+            DllManipulatorEditor.RepaintAllEditors += window.Repaint;
         }
 
         void OnGUI()