From 8a1cd9396f5d0517d35a9945a25e110fff2904c0 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Tue, 5 Dec 2017 15:19:34 -0500 Subject: [PATCH 1/2] Preventing checkout request when branch is already checked out --- .../Assets/Editor/GitHub.Unity/UI/BranchesView.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs index 3ea3f5dcc..d71a59c8c 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BranchesView.cs @@ -323,6 +323,9 @@ private void OnTreeGUI(Rect rect) if (node.IsFolder) return; + if(node.IsActive) + return; + SwitchBranch(node.Name); }, node => { From ba4f7f747fabf16748e7986ae8274b3626a62238 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Tue, 5 Dec 2017 17:13:27 -0500 Subject: [PATCH 2/2] Remembering the last selected node when reloading the tree --- .../Assets/Editor/GitHub.Unity/UI/TreeControl.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs index 5c668049b..5f5f505bc 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs @@ -56,6 +56,12 @@ public void Load(IEnumerable data, string title) { var collapsedFoldersEnumerable = folders.Where(pair => pair.Value.IsCollapsed).Select(pair => pair.Key); var collapsedFolders = new HashSet(collapsedFoldersEnumerable); + string selectedNodeName = null; + if (SelectedNode != null) + { + selectedNodeName = SelectedNode.Name; + SelectedNode = null; + } folders.Clear(); nodes.Clear(); @@ -94,6 +100,11 @@ public void Load(IEnumerable data, string title) IsFolder = isFolder }; + if (selectedNodeName != null && name == selectedNodeName) + { + SelectedNode = node; + } + if (node.IsActive) { activeNode = node;