Attempting to change focus on the change of focus to another control

Author: StanleyGoldman

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

@@ -79,6 +79,12 @@ public override void OnDataUpdate()
             MaybeUpdateData();
         }
 
+        public override void OnSelectionChange()
+        {
+            base.OnSelectionChange();
+            Redraw();
+        }
+
         private void RepositoryOnLocalAndRemoteBranchListChanged(CacheUpdateEvent cacheUpdateEvent)
         {
             if (!lastLocalAndRemoteBranchListChangedEvent.Equals(cacheUpdateEvent))

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

@@ -94,19 +94,17 @@ protected Texture GetNodeIconBadge(ChangesTreeNode node)
 
         protected override ChangesTreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, GitStatusEntryTreeData? treeData)
         {
-            var node = new ChangesTreeNode
-            {
-                Path = path,
-                Label = label,
-                Level = level,
-                IsFolder = isFolder,
-                IsActive = isActive,
-                IsHidden = isHidden,
-                IsCollapsed = isCollapsed,
-                TreeIsCheckable = IsCheckable,
-                GitFileStatus = treeData.HasValue ? treeData.Value.FileStatus : GitFileStatus.None,
-                ProjectPath = treeData.HasValue ? treeData.Value.ProjectPath : null
-            };
+            var node = ScriptableObject.CreateInstance<ChangesTreeNode>();
+            node.Path = path;
+            node.Label = label;
+            node.Level = level;
+            node.IsFolder = isFolder;
+            node.IsActive = isActive;
+            node.IsHidden = isHidden;
+            node.IsCollapsed = isCollapsed;
+            node.TreeIsCheckable = IsCheckable;
+            node.GitFileStatus = treeData.HasValue ? treeData.Value.FileStatus : GitFileStatus.None;
+            node.ProjectPath = treeData.HasValue ? treeData.Value.ProjectPath : null;
 
             if (isFolder)
             {

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

@@ -94,6 +94,12 @@ public override void OnGUI()
             OnCommitDetailsAreaGUI();
         }
 
+        public override void OnSelectionChange()
+        {
+            base.OnSelectionChange();
+            Redraw();
+        }
+
         private void OnTreeGUI(Rect rect)
         {
             var initialRect = rect;

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

@@ -53,6 +53,7 @@ public override TNode SelectedNode
             set
             {
                 selectedNode = value;
+                Selection.activeObject = value;
             }
         }
 
@@ -88,11 +89,14 @@ protected override List<TNode> Nodes
         public Rect Render(Rect containingRect, Rect rect, Vector2 scroll, Action<TNode> singleClick = null, Action<TNode> doubleClick = null, Action<TNode> rightClick = null)
         {
             controlId = GUIUtility.GetControlID(FocusType.Keyboard);
+            var treeHasFocus = GUIUtility.keyboardControl == controlId && Selection.activeObject == selectedNode;
+
+            if (!Nodes.Any())
+                return new Rect(0f, rect.y, 0f, 0f);
 
             var treeNodeStyle = TreeNodeStyle;
             var activeTreeNodeStyle = ActiveTreeNodeStyle;
 
-            var treeHasFocus = GUIUtility.keyboardControl == controlId;
             if (treeHasFocus)
             {
                 treeNodeStyle = FocusedTreeNodeStyle;
@@ -359,7 +363,6 @@ private void Unindent()
             indents.Pop();
         }
 
-
         protected void LoadNodeIcons()
         {
             foreach (var treeNode in Nodes)
@@ -370,7 +373,7 @@ protected void LoadNodeIcons()
     }
 
     [Serializable]
-    public class TreeNode : ITreeNode
+    public class TreeNode : ScriptableObject, ITreeNode
     {
         public string path;
         public string label;
@@ -603,16 +606,15 @@ protected Texture GetNodeIcon(TreeNode node)
 
         protected override TreeNode CreateTreeNode(string path, string label, int level, bool isFolder, bool isActive, bool isHidden, bool isCollapsed, GitBranchTreeData? treeData)
         {
-            var node = new TreeNode {
-                Path = path,
-                Label = label,
-                Level = level,
-                IsFolder = isFolder,
-                IsActive = isActive,
-                IsHidden = isHidden,
-                IsCollapsed = isCollapsed,
-                TreeIsCheckable = IsCheckable
-            };
+            var node = ScriptableObject.CreateInstance<TreeNode>();
+            node.Path = path;
+            node.Label = label;
+            node.Level = level;
+            node.IsFolder = isFolder;
+            node.IsActive = isActive;
+            node.IsHidden = isHidden;
+            node.IsCollapsed = isCollapsed;
+            node.TreeIsCheckable = IsCheckable;
 
             if (isFolder)
             {