Merge pull request #61 from Unity-Technologies/searchbar

Searchbar

Author: alffanclub

Editor/AssetBundleBrowserMain.cs

@@ -10,6 +10,17 @@ namespace AssetBundleBrowser
     public class AssetBundleBrowserMain : EditorWindow, IHasCustomMenu, ISerializationCallbackReceiver
     {
 
+        private static AssetBundleBrowserMain m_instance = null;
+        internal static AssetBundleBrowserMain instance
+        {
+            get
+            {
+                if (m_instance == null)
+                    m_instance = GetWindow<AssetBundleBrowserMain>();
+                return m_instance;
+            }
+        }
+
         internal const float kButtonWidth = 150;
 
         enum Mode
@@ -41,9 +52,9 @@ enum Mode
         [MenuItem("Window/AssetBundle Browser", priority = 2050)]
         static void ShowWindow()
         {
-            var window = GetWindow<AssetBundleBrowserMain>();
-            window.titleContent = new GUIContent("AssetBundles");
-            window.Show();
+            m_instance = null;
+            instance.titleContent = new GUIContent("AssetBundles");
+            instance.Show();
         }
 
         [SerializeField]

Editor/AssetBundleManageTab.cs

@@ -37,6 +37,7 @@ internal class AssetBundleManageTab
         const float k_SplitterWidth = 3f;
         private static float m_UpdateDelay = 0f;
 
+        SearchField m_searchField;
 
         EditorWindow m_Parent = null;
 
@@ -66,6 +67,8 @@ internal void OnEnable(Rect pos, EditorWindow parent)
                 (int)(m_Position.y + m_HorizontalSplitterRect.height * m_VerticalSplitterPercentLeft),
                 (m_HorizontalSplitterRect.width) - k_SplitterWidth,
                 k_SplitterWidth);
+
+            m_searchField = new SearchField();
         }
 
 
@@ -167,15 +170,18 @@ internal void OnGUI(Rect pos)
                 //Right half.
                 float panelLeft = m_HorizontalSplitterRect.x + k_SplitterWidth;
                 float panelWidth = m_VerticalSplitterRectRight.width - k_SplitterWidth * 2;
-                float panelHeight = m_VerticalSplitterRectRight.y - m_Position.y;
+                float searchHeight = 20f;
+                float panelTop = m_Position.y + searchHeight;
+                float panelHeight = m_VerticalSplitterRectRight.y - panelTop;
+                OnGUISearchBar(new Rect(panelLeft, m_Position.y, panelWidth, searchHeight));
                 m_AssetList.OnGUI(new Rect(
                     panelLeft,
-                    m_Position.y,
+                    panelTop,
                     panelWidth,
                     panelHeight));
                 m_MessageList.OnGUI(new Rect(
                     panelLeft,
-                    m_Position.y + panelHeight + k_SplitterWidth,
+                    panelTop + panelHeight + k_SplitterWidth,
                     panelWidth,
                     (m_Position.height - panelHeight) - k_SplitterWidth * 2));
 
@@ -184,6 +190,16 @@ internal void OnGUI(Rect pos)
             }
         }
 
+        void OnGUISearchBar(Rect rect)
+        {
+            m_BundleTree.searchString = m_searchField.OnGUI(rect, m_BundleTree.searchString);
+            m_AssetList.searchString = m_BundleTree.searchString;
+        }
+
+        public bool hasSearch
+        {
+            get { return m_BundleTree.hasSearch;  }
+        }
 
         private void HandleHorizontalResize()
         {

Editor/AssetBundleModel/ABModelBundleInfo.cs

@@ -8,7 +8,7 @@
 namespace AssetBundleBrowser.AssetBundleModel
 {
     internal class BundleTreeItem : TreeViewItem
-    {
+    {   
         private BundleInfo m_Bundle;
         internal BundleInfo bundle
         {
@@ -25,6 +25,14 @@ internal MessageSystem.Message BundleMessage()
         {
             return m_Bundle.HighestMessage();
         }
+
+        public override string displayName
+        {
+            get
+            {
+                return AssetBundleBrowserMain.instance.m_ManageTab.hasSearch ? m_Bundle.m_Name.fullNativeName : m_Bundle.displayName;
+            }
+        }
     }
 
     internal class BundleNameData
@@ -242,6 +250,8 @@ internal void ForceNeedUpdate()
 
         abstract internal void HandleReparent(string parentName, BundleFolderInfo newParent = null);
         abstract internal List<AssetInfo> GetDependencies();
+
+        abstract internal bool DoesItemMatchSearch(string search);
     }
 
     internal class BundleDataInfo : BundleInfo
@@ -545,6 +555,21 @@ internal override List<AssetInfo> GetDependencies()
         {
             return m_DependentAssets;
         }
+
+        internal override bool DoesItemMatchSearch(string search)
+        {
+            foreach(var asset in m_ConcreteAssets)
+            {
+                if (asset.displayName.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0)
+                    return true;
+            }
+            foreach (var asset in m_DependentAssets)
+            {
+                if (asset.displayName.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0)
+                    return true;
+            }
+            return false;
+        }
     }
 
     internal class BundleVariantDataInfo : BundleDataInfo
@@ -721,6 +746,11 @@ internal override void HandleDelete(bool isRootOfDelete, string forcedNewName=""
             m_Children.Clear();
         }
 
+        internal override bool DoesItemMatchSearch(string search)
+        {
+            return false; //folders don't ever match.
+        }
+
         protected override void RefreshMessages()
         {
             m_BundleMessages.SetFlag(MessageSystem.MessageFlag.ErrorInChildren, false);

Editor/AssetBundleTree.cs

@@ -31,6 +31,12 @@ protected override bool CanRename(TreeViewItem item)
             return item.displayName.Length > 0;
         }
 
+        protected override bool DoesItemMatchSearch(TreeViewItem item, string search)
+        {
+            var bundleItem = item as AssetBundleModel.BundleTreeItem;
+            return bundleItem.bundle.DoesItemMatchSearch(search);
+        }
+
         protected override void RowGUI(RowGUIArgs args)
         {
             var bundleItem = (args.item as AssetBundleModel.BundleTreeItem);