diff --git a/.idea/.idea.AsmdefHelper/.idea/contentModel.xml b/.idea/.idea.AsmdefHelper/.idea/contentModel.xml index 75dd7ce..2a1b2d7 100644 --- a/.idea/.idea.AsmdefHelper/.idea/contentModel.xml +++ b/.idea/.idea.AsmdefHelper/.idea/contentModel.xml @@ -9,6 +9,7 @@ + @@ -40,7 +41,7 @@ - + @@ -51,6 +52,8 @@ + + diff --git a/.idea/.idea.AsmdefHelper/.idea/workspace.xml b/.idea/.idea.AsmdefHelper/.idea/workspace.xml index 95c4b1d..da1e05d 100644 --- a/.idea/.idea.AsmdefHelper/.idea/workspace.xml +++ b/.idea/.idea.AsmdefHelper/.idea/workspace.xml @@ -2,14 +2,16 @@ - - + + + + - - - - + + + + diff --git a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef new file mode 100644 index 0000000..db44666 --- /dev/null +++ b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef @@ -0,0 +1,17 @@ +{ + "name": "AsmdefHelper.MultipleEdit.Editor", + "references": [ + "GUID:211243abc45174c45b3a6c275ea126b9" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref.meta b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef.meta similarity index 56% rename from Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref.meta rename to Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef.meta index 2eb5131..d707cb9 100644 --- a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref.meta +++ b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmdef.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 43a16440f46e8054e8bb12c38f573975 -AssemblyDefinitionReferenceImporter: +guid: ddba71eed1843ba40a83179bf71e2848 +AssemblyDefinitionImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref deleted file mode 100644 index 0a12953..0000000 --- a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefHelper.MultipleEdit.Editor.asmref +++ /dev/null @@ -1,3 +0,0 @@ -{ - "reference": "GUID:211243abc45174c45b3a6c275ea126b9" -} \ No newline at end of file diff --git a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs index 120727b..08912b1 100644 --- a/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs +++ b/Assets/AsmdefHelper/MultipleEdit/Editor/AsmdefMultiEditWindow.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using AsmdefHelper.UnityInternal; using UnityEditor; using UnityEditor.Experimental.AssetImporters; using UnityEditorInternal; @@ -9,8 +10,9 @@ namespace AsmdefHelper.MultipleEdit.Editor { public class AsmdefMultiEditWindow : EditorWindow { [MenuItem("Window/Asmdef Helper/Find all asmdef in project")] public static void Search() { - var projectBrowser = GetWindow(); - projectBrowser.SetSearch("t:AssemblyDefinitionAsset"); + var browser = CreateInstance(); + browser.GetProjectBrowser(); + browser.SetSearch("t:AssemblyDefinitionAsset"); } [MenuItem("Window/Asmdef Helper/Open selected asmdef inspector view")] @@ -23,9 +25,10 @@ namespace AsmdefHelper.MultipleEdit.Editor { foreach (var adf in asmdefs) { Selection.objects = new[] { adf }; - var w = CreateWindow(); + var w = CreateInstance(); + w.GetInspectorWindow(); // LockすることでInspectorWindowの表示を固定する - w.isLocked = true; + w.Lock(true); } } } diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs new file mode 100644 index 0000000..bbaa74d --- /dev/null +++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs @@ -0,0 +1,17 @@ +using UnityEditor; + +namespace AsmdefHelper.UnityInternal { + public class InspectorWindowWrapper : EditorWindow{ + InspectorWindow inspectorWindow; + + public void GetInspectorWindow() { + inspectorWindow = CreateWindow(); + } + + public void Lock(bool isLock) { + if (inspectorWindow != null) { + inspectorWindow.isLocked = isLock; + } + } + } +} diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs.meta b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs.meta new file mode 100644 index 0000000..5ec763e --- /dev/null +++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/InspectorWindowWrapper.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ab307b553b134091996ec036836c42b8 +timeCreated: 1586954046 \ No newline at end of file diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs new file mode 100644 index 0000000..122dfef --- /dev/null +++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs @@ -0,0 +1,17 @@ +using UnityEditor; + +namespace AsmdefHelper.UnityInternal { + public class ProjectBrowserWrapper : EditorWindow { + ProjectBrowser projectBrowser; + + public void GetProjectBrowser() { + projectBrowser = GetWindow(); + } + + public void SetSearch(string searchText) { + if (projectBrowser != null) { + projectBrowser.SetSearch(searchText); + } + } + } +} diff --git a/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs.meta b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs.meta new file mode 100644 index 0000000..8f3fe7a --- /dev/null +++ b/Assets/AsmdefHelper/Unity.InternalAPIEditorBridgeDev.001/ProjectBrowserWrapper.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 78b9d6d4797040088ab730c9be37c6b9 +timeCreated: 1586952941 \ No newline at end of file