From dcc5d5e0ad63efe4086caa2e1ac4eb3c3f50c5f3 Mon Sep 17 00:00:00 2001 From: yasirkula Date: Sat, 4 Dec 2021 17:03:45 +0300 Subject: [PATCH] It's now possible to only highlight the clicked search results instead of actually selecting them via the window's context menu --- .../Editor/AssetUsageDetectorWindow.cs | 9 +++++++-- .../AssetUsageDetector/Editor/SearchResult.cs | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs index cb926e4..03ff6bb 100644 --- a/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs +++ b/Plugins/AssetUsageDetector/Editor/AssetUsageDetectorWindow.cs @@ -14,7 +14,7 @@ namespace AssetUsageDetectorNamespace { public enum Phase { Setup, Processing, Complete }; - public class AssetUsageDetectorWindow : EditorWindow + public class AssetUsageDetectorWindow : EditorWindow, IHasCustomMenu { private const float PLAY_MODE_REFRESH_INTERVAL = 1f; // Interval to refresh the editor window in play mode @@ -80,7 +80,12 @@ namespace AssetUsageDetectorNamespace private static AssetUsageDetectorWindow mainWindow = null; - // Add "Asset Usage Detector" menu item to the Window menu + void IHasCustomMenu.AddItemsToMenu( GenericMenu menu ) + { + if( currentPhase == Phase.Complete ) + menu.AddItem( new GUIContent( "Select Clicked Objects" ), SearchResult.SelectClickedObjects, () => SearchResult.SelectClickedObjects = !SearchResult.SelectClickedObjects ); + } + [MenuItem( "Window/Asset Usage Detector/Active Window" )] private static void OpenActiveWindow() { diff --git a/Plugins/AssetUsageDetector/Editor/SearchResult.cs b/Plugins/AssetUsageDetector/Editor/SearchResult.cs index 7bef4fd..b45a495 100644 --- a/Plugins/AssetUsageDetector/Editor/SearchResult.cs +++ b/Plugins/AssetUsageDetector/Editor/SearchResult.cs @@ -79,6 +79,12 @@ namespace AssetUsageDetectorNamespace public bool InitialSceneSetupConfigured { get { return initialSceneSetup != null && initialSceneSetup.Length > 0; } } public AssetUsageDetector.Parameters SearchParameters { get { return m_searchParameters; } } + public static bool SelectClickedObjects + { + get { return EditorPrefs.GetBool( "AUD_SelectClickedObj", true ); } + set { EditorPrefs.SetBool( "AUD_SelectClickedObj", value ); } + } + public SearchResult( bool success, List result, SceneSetup[] initialSceneSetup, AssetUsageDetector searchHandler, AssetUsageDetector.Parameters searchParameters ) { if( result == null ) @@ -739,7 +745,10 @@ namespace AssetUsageDetectorNamespace if( Event.current.button != 1 ) { // If the container (scene, usually) is left clicked, highlight it on Project view - AssetDatabase.LoadAssetAtPath( Title ).SelectInEditor(); + if( SearchResult.SelectClickedObjects ) + AssetDatabase.LoadAssetAtPath( Title ).SelectInEditor(); + else + AssetDatabase.LoadAssetAtPath( Title ).PingInEditor(); } else if( !EditorApplication.isPlaying && EditorSceneManager.loadedSceneCount > 1 ) { @@ -1350,7 +1359,10 @@ namespace AssetUsageDetectorNamespace if( GUI.Button( rect, label, Utilities.BoxGUIStyle ) && instanceId.HasValue ) { // If a reference is clicked, highlight it (either on Hierarchy view or Project view) - EditorUtility.InstanceIDToObject( instanceId.Value ).SelectInEditor(); + if( SearchResult.SelectClickedObjects ) + EditorUtility.InstanceIDToObject( instanceId.Value ).SelectInEditor(); + else + EditorUtility.InstanceIDToObject( instanceId.Value ).PingInEditor(); } for( int i = 0; i < links.Length; i++ )