Minor UI fixes

Author: mrtrizer

Editor/GitBranchesWindow.cs

@@ -108,23 +108,6 @@ protected override void OnGUI()
 
             base.OnGUI();
         }
-        List<TreeViewItem> GenerateItems(IEnumerable<Reference[]> branchesPerRepo)
-        {
-            var modules = PackageShortcuts.GetSelectedGitModules();
-            IEnumerable<Reference> references = branchesPerRepo.Count() == 1 ? branchesPerRepo.First()
-                : showAllBranches ? branchesPerRepo.SelectMany(x => x).Distinct(referenceComparer)
-                : branchesPerRepo.Skip(1).Aggregate(branchesPerRepo.First().AsEnumerable(), (result, nextArray) => result.Intersect(nextArray, referenceComparer));
-            var items = new List<TreeViewItem>();
-            items.Add(new TreeViewItem(0, 0, "Branches") { icon = EditorGUIUtility.IconContent("UnityEditor.VersionControl").image as Texture2D });
-            BranchesToItems(modules, references, x => x is LocalBranch, 1, items);
-            items.Add(new TreeViewItem(1, 0, "Remotes") { icon = EditorGUIUtility.IconContent("CloudConnect@2x").image as Texture2D });
-            BranchesToItems(modules, references, x => x is RemoteBranch, 1, items);
-            items.Add(new TreeViewItem(2, 0, "Tags") { icon = EditorGUIUtility.IconContent("FilterByLabel@2x").image as Texture2D });
-            BranchesToItems(modules, references, x => x is Tag, 1, items);
-            items.Add(new TreeViewItem(3, 0, "Stashes") { icon = EditorGUIUtility.IconContent("Package Manager@2x").image as Texture2D });
-            BranchesToItems(modules, references, x => x is Stash, 1, items);
-            return items;
-        }
         static async void CreateOrRenameBranch(string oldName = null)
         {
             string newName = oldName;
@@ -219,6 +202,23 @@ void ShowContextMenu(IEnumerable<Module> modules, Reference selectedReference)
             menu.AddItem(new GUIContent($"New Tag"), false, () =>  GUIShortcuts.MakeTag());
             menu.ShowAsContext();
         }
+        List<TreeViewItem> GenerateItems(IEnumerable<Reference[]> branchesPerRepo)
+        {
+            var modules = PackageShortcuts.GetSelectedGitModules();
+            IEnumerable<Reference> references = branchesPerRepo.Count() == 1 ? branchesPerRepo.First()
+                : showAllBranches ? branchesPerRepo.SelectMany(x => x).Distinct(referenceComparer)
+                : branchesPerRepo.Skip(1).Aggregate(branchesPerRepo.First().AsEnumerable(), (result, nextArray) => result.Intersect(nextArray, referenceComparer));
+            var items = new List<TreeViewItem>();
+            items.Add(new TreeViewItem(0, 0, "Branches") { icon = EditorGUIUtility.IconContent("UnityEditor.VersionControl").image as Texture2D });
+            BranchesToItems(modules, references, x => x is LocalBranch, 1, items);
+            items.Add(new TreeViewItem(1, 0, "Remotes") { icon = EditorGUIUtility.IconContent("CloudConnect@2x").image as Texture2D });
+            BranchesToItems(modules, references, x => x is RemoteBranch, 1, items);
+            items.Add(new TreeViewItem(2, 0, "Tags") { icon = EditorGUIUtility.IconContent("FilterByLabel@2x").image as Texture2D });
+            BranchesToItems(modules, references, x => x is Tag, 1, items);
+            items.Add(new TreeViewItem(3, 0, "Stashes") { icon = EditorGUIUtility.IconContent("Package Manager@2x").image as Texture2D });
+            BranchesToItems(modules, references, x => x is Stash, 1, items);
+            return items;
+        }
         List<TreeViewItem> BranchesToItems(IEnumerable<Module> modules, IEnumerable<Reference> branches, Func<Reference, bool> filter, int rootDepth, List<TreeViewItem> items)
         {
             string currentPath = "";

Editor/GitLogWindow.cs

@@ -358,7 +358,6 @@ async void ShowCommitContextMenu(Module module, string selectedCommit, IEnumerab
                         if (EditorUtility.DisplayDialog("Are you sure you want RESET to COMMIT", reference.QualifiedName, "Yes", "No"))
                             _ = module.Reset(reference.QualifiedName, false);
                     });
-                    menu.AddItem(new GUIContent($"New Tag"), false, () => GUIShortcuts.MakeTag(selectedCommit));
                 }
             }
             if (!LogFiles.Any())
@@ -379,6 +378,7 @@ async void ShowCommitContextMenu(Module module, string selectedCommit, IEnumerab
                         _ = GUIShortcuts.RunGitAndErrorCheck(new[] { module }, x => x.CherryPick(selectedCommits));
                 });
             }
+            menu.AddItem(new GUIContent($"New Tag"), false, () => GUIShortcuts.MakeTag(selectedCommit));
             menu.ShowAsContext();
         }
         static void ShowFileContextMenu(Module module, IEnumerable<FileStatus> files, string selectedCommit)

Editor/GitSettingsWindow.cs

@@ -12,13 +12,13 @@ namespace Abuksigun.MRGitUI
 {
     public static class GitSettings
     {
-        [MenuItem("Assets/Git/Settings", true)]
+        [MenuItem("Assets/Git/Remote Settings", true)]
         public static bool Check() => PackageShortcuts.GetSelectedGitModules().Any();
-        [MenuItem("Assets/Git/Settings", priority = 100)]
+        [MenuItem("Assets/Git/Remote Settings", priority = 100)]
         public static async void Invoke()
         {
             var window = EditorWindow.CreateInstance<GitSettingsWindow>();
-            window.titleContent = new GUIContent("Git Settings");
+            window.titleContent = new GUIContent("Git Remote Settings");
             await GUIShortcuts.ShowModalWindow(window, new Vector2Int(500, 300));
         }
     }