Functionality to make global selection optional

Author: StanleyGoldman

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs

@@ -179,13 +179,11 @@ private void TreeOnEnable()
         {
             if (treeLocals != null)
             {
-                treeLocals.OnEnable();
                 treeLocals.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
             }
 
             if (treeRemotes != null)
             {
-                treeRemotes.OnEnable();
                 treeRemotes.UpdateIcons(Styles.ActiveBranchIcon, Styles.BranchIcon, Styles.FolderIcon, Styles.GlobeIcon);
             }
         }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesTreeControl.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using UnityEditor;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace GitHub.Unity
 {
@@ -47,8 +48,10 @@ public class ChangesTree : Tree<ChangesTreeNode, GitStatusEntryTreeData>
         [SerializeField] public bool displayRootNode = true;
         [SerializeField] public bool isSelectable = true;
         [SerializeField] public bool isCheckable = false;
+        [SerializeField] public bool isUsingGlobalSelection = false;
         [SerializeField] private List<ChangesTreeNode> nodes = new List<ChangesTreeNode>();
         [SerializeField] private ChangesTreeNode selectedNode = null;
+        [NonSerialized] private Object lastActiveObject;
 
         public override string Title
         {
@@ -92,6 +95,27 @@ public override ChangesTreeNode SelectedNode
             set
             {
                 selectedNode = value;
+
+                if (!IsUsingGlobalSelection)
+                {
+                    return;
+                }
+
+                Object activeObject = null;
+                if (selectedNode != null)
+                {
+                    var projectPath = selectedNode.ProjectPath;
+                    if (projectPath.StartsWith("Assets"))
+                    {
+                        var assetGuid = AssetDatabase.AssetPathToGUID(projectPath);
+                        activeObject = !string.IsNullOrEmpty(assetGuid)
+                            ? AssetDatabase.LoadMainAssetAtPath(projectPath)
+                            : null;
+                    }
+                }
+
+                lastActiveObject = activeObject;
+                Selection.activeObject = activeObject;
             }
         }
 
@@ -100,6 +124,12 @@ protected override List<ChangesTreeNode> Nodes
             get { return nodes; }
         }
 
+        public bool IsUsingGlobalSelection
+        {
+            get { return isUsingGlobalSelection; }
+            set { isUsingGlobalSelection = value; }
+        }
+
         public void UpdateIcons(Texture2D folderIcon)
         {
             var needsLoad = FolderIcon == null;
@@ -218,5 +248,16 @@ protected override void AddCheckedNode(ChangesTreeNode node)
         {
             checkedFileNodes.Add(((ITreeNode)node).Path, node);
         }
+
+        public override Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<ChangesTreeNode> singleClick = null, Action<ChangesTreeNode> doubleClick = null,
+            Action<ChangesTreeNode> rightClick = null)
+        {
+            if (IsUsingGlobalSelection && lastActiveObject != null && Selection.activeObject != lastActiveObject)
+            {
+                SelectedNode = null;
+            }
+
+            return base.Render(treeDisplayRect, scroll, singleClick, doubleClick, rightClick);
+        }
     }
 }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ChangesView.cs

@@ -227,7 +227,6 @@ private void TreeOnEnable()
         {
             if (treeChanges != null)
             {
-                treeChanges.OnEnable();
                 treeChanges.UpdateIcons(Styles.FolderIcon);
             }
         }

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

@@ -32,7 +32,7 @@ public abstract class Tree<TNode, TData>: TreeBase<TNode, TData>
         public bool IsInitialized { get { return Nodes != null && Nodes.Count > 0 && !String.IsNullOrEmpty(Nodes[0].Path); } }
         public bool RequiresRepaint { get; private set; }
 
-        public Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
+        public virtual Rect Render(Rect treeDisplayRect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
         {
             controlId = GUIUtility.GetControlID(FocusType.Keyboard);
             var treeHasFocus = GUIUtility.keyboardControl == controlId;
@@ -322,11 +322,6 @@ protected void LoadNodeIcons()
                 SetNodeIcon(treeNode);
             }
         }
-
-        public void OnEnable()
-        {
-            
-        }
     }
 
     [Serializable]