Merge pull request #4 from danigfedev/Edit_Script_Icon_Bugfix

Edit script icon bugfix and removed Editor coroutines dependencies

Author: danigfedev

Editor/AssetCreationMenu.cs

@@ -4,10 +4,8 @@
 using System.IO;
 using UnityEngine.Assertions;
 using System.Text;
-using System.Collections;
 using System.Linq;
 using System.Text.RegularExpressions;
-using Unity.EditorCoroutines.Editor;
 
 namespace EG.ScriptableObjectSystem.Editor
 {
@@ -26,16 +24,20 @@ public class AssetCreationMenu : UnityEditor.Editor
 
         private class EditorAssetIconReplacer : UnityEditor.Editor
         {
-            public IEnumerator AddIcon(string scriptPath, string iconName)
+            public void EditScriptIcon(string scriptPath, string iconName)
             {
+                EditorApplication.delayCall += EditScriptIconInternal;
                 AssetDatabase.Refresh();
-
-                yield return null; //Wait just for one editor frame
 
-                var monoImporter = AssetImporter.GetAtPath(scriptPath) as MonoImporter;
-                var icon = AssetDatabase.LoadAssetAtPath<Texture2D>(_packageRelativePath + iconName);
-                monoImporter.SetIcon(icon);
-                monoImporter.SaveAndReimport();
+                void EditScriptIconInternal()
+                {
+                    EditorApplication.delayCall -= EditScriptIconInternal;
+                    
+                    var monoImporter = AssetImporter.GetAtPath(scriptPath) as MonoImporter;
+                    var icon = AssetDatabase.LoadAssetAtPath<Texture2D>(_packageRelativePath + iconName);
+                    monoImporter.SetIcon(icon);
+                    monoImporter.SaveAndReimport();
+                }
             }
         }
 
@@ -126,7 +128,7 @@ private static void CreateSOEventScript(string creationPath, string eventName, s
             //5-Add Custom Icon:
             var filePathInProject = GetPathInProjectAssets(filePath);
             var iconClass = new EditorAssetIconReplacer();
-            EditorCoroutineUtility.StartCoroutineOwnerless(iconClass.AddIcon(filePathInProject, EventIconRelativepath));
+            iconClass.EditScriptIcon(filePathInProject, EventIconRelativepath);
         }
 
         private static void CreateSOEventListenerScript(string creationPath, string eventName, string listenerName, string eventNamespace, string[] argTypes)
@@ -169,7 +171,7 @@ private static void CreateSOEventListenerScript(string creationPath, string even
             //5-Add Custom Icon:
             var filePathInProject = GetPathInProjectAssets(filePath);
             var iconClass = new EditorAssetIconReplacer();
-            EditorCoroutineUtility.StartCoroutineOwnerless(iconClass.AddIcon(filePathInProject, EventListenerIconRelativePath));
+            iconClass.EditScriptIcon(filePathInProject, EventListenerIconRelativePath);
         }
 
         private static string ReplaceNamespaceTag(string eventNamespace, string contents)

Editor/EspidiGames.SOEventSystem.Editor.asmdef

@@ -2,7 +2,6 @@
     "name": "EspidiGames.SOEventSystem.Editor",
     "rootNamespace": "",
     "references": [
-        "GUID:478a2357cc57436488a56e564b08d223",
         "GUID:2c34241bc039bf74eab5e91e0d89b976"
     ],
     "includePlatforms": [

Editor/ScriptableObjectEventCreationWindow.cs

@@ -1,6 +1,4 @@
-using System.Collections;
 using System.Linq;
-using Unity.EditorCoroutines.Editor;
 using UnityEditor;
 using UnityEngine;
 
@@ -29,25 +27,17 @@ public class ScriptableObjectEventCreationWindow : EditorWindow
 
         public static void OpenWindow()
         {
-            //Calling this opens window normally (non-modal)
             _window = GetWindow<ScriptableObjectEventCreationWindow>(true, "Select Randomized Selected Objects");
             SetWindowSize(InitialWindowDimensions);
-            EditorCoroutineUtility.StartCoroutineOwnerless(_window.MakeWindowModal());
-        }
-
-        /// <summary>
-        /// Coroutine that skips one editor frame and then makes Window modal.
-        /// Necessary to open window from Project panel (right click -> Create/EspidiGames/SO Events / Open window)
-        ///For whatever reason, opening from that context menu left the window completely blank
-        /// (it was working from unity menus though))
-        /// </summary>
-        private IEnumerator MakeWindowModal()
-        {
-            yield return null; //Wait just for one editor frame
 
-            this.ShowModalUtility();
+            EditorApplication.delayCall += MakeWindowModal;
+            void MakeWindowModal()
+            {
+                EditorApplication.delayCall -= MakeWindowModal;
+                _window.ShowModalUtility();
+            }
         }
-
+        
         private void OnGUI()
         {
             EditorGUILayout.Space();

package.json

@@ -13,9 +13,6 @@
     "email": "danigfe.dev@gmail.com",
     "url": "https://github.com/danigfedev"
   },
-  "dependencies": {
-    "com.unity.editorcoroutines": "1.0.0"
-  },
   "keywords": [
     "so",
     "scriptableobject",