feature: add context menu for issue link in commit details panel (#651)

love-linger · love-linger · commit 163e8cc0a4f7 · 2024-11-04T15:31:55.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/Models/CustomAction.cs b/src/Models/CustomAction.cs
@@ -30,7 +30,7 @@ public string Executable
 
         public string Arguments
         {
-            get => _arguments; 
+            get => _arguments;
             set => SetProperty(ref _arguments, value);
         }
 
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
@@ -325,8 +325,8 @@ private string FindVisualStudio()
             if (localMachine.OpenSubKey(@"SOFTWARE\Classes\VisualStudio.Launcher.sln\CLSID") is Microsoft.Win32.RegistryKey launcher)
             {
                 // Get actual path to the executable
-                if (launcher.GetValue(string.Empty) is string CLSID && 
-                    localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv && 
+                if (launcher.GetValue(string.Empty) is string CLSID &&
+                    localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv &&
                     devenv.GetValue(string.Empty) is string localServer32)
                 {
                     return localServer32!.Trim('\"');
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
@@ -387,6 +387,8 @@
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
+  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
+  <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copy Link</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
diff --git a/src/Views/Blame.axaml.cs b/src/Views/Blame.axaml.cs
@@ -407,8 +407,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
 
             var menu = new ContextMenu();
             menu.Items.Add(copy);
+            menu.Open(TextArea.TextView);
 
-            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 
diff --git a/src/Views/BranchCompare.axaml.cs b/src/Views/BranchCompare.axaml.cs
@@ -15,7 +15,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
             if (DataContext is ViewModels.BranchCompare vm && sender is ChangeCollectionView view)
             {
                 var menu = vm.CreateChangeContextMenu();
-                view.OpenContextMenu(menu);
+                menu?.Open(view);
             }
 
             e.Handled = true;
diff --git a/src/Views/BranchTree.axaml.cs b/src/Views/BranchTree.axaml.cs
@@ -374,7 +374,7 @@ private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2)
             if (selected.Count == 1 && selected[0] is ViewModels.BranchTreeNode { Backend: Models.Remote remote })
             {
                 var menu = repo.CreateContextMenuForRemote(remote);
-                this.OpenContextMenu(menu);
+                menu?.Open(this);
                 return;
             }
 
@@ -391,7 +391,7 @@ private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2)
                 var menu = branch.IsLocal ?
                     repo.CreateContextMenuForLocalBranch(branch) :
                     repo.CreateContextMenuForRemoteBranch(branch);
-                this.OpenContextMenu(menu);
+                menu?.Open(this);
             }
             else if (branches.Find(x => x.IsCurrent) == null)
             {
@@ -405,7 +405,7 @@ private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2)
                     ev.Handled = true;
                 };
                 menu.Items.Add(deleteMulti);
-                this.OpenContextMenu(menu);
+                menu?.Open(this);
             }
         }
 
diff --git a/src/Views/CommitBaseInfo.axaml.cs b/src/Views/CommitBaseInfo.axaml.cs
@@ -68,7 +68,7 @@ private void OnCopyCommitSHA(object sender, RoutedEventArgs e)
 
         private void OnOpenWebLink(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.CommitDetail detail)
+            if (DataContext is ViewModels.CommitDetail detail && sender is Control control)
             {
                 var links = WebLinks;
                 if (links.Count > 1)
@@ -88,7 +88,7 @@ private void OnOpenWebLink(object sender, RoutedEventArgs e)
                         menu.Items.Add(item);
                     }
 
-                    (sender as Control)?.OpenContextMenu(menu);
+                    menu?.Open(control);
                 }
                 else if (links.Count == 1)
                 {
diff --git a/src/Views/CommitChanges.axaml.cs b/src/Views/CommitChanges.axaml.cs
@@ -16,7 +16,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
                 DataContext is ViewModels.CommitDetail vm)
             {
                 var menu = vm.CreateChangeContextMenu(selected[0]);
-                view.OpenContextMenu(menu);
+                menu?.Open(view);
             }
 
             e.Handled = true;
diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
@@ -26,7 +26,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
             if (DataContext is ViewModels.CommitDetail detail && sender is Grid grid && grid.DataContext is Models.Change change)
             {
                 var menu = detail.CreateChangeContextMenu(change);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
             }
 
             e.Handled = true;
diff --git a/src/Views/CommitMessagePresenter.cs b/src/Views/CommitMessagePresenter.cs
@@ -176,7 +176,41 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
                 }
                 else
                 {
-                    Native.OS.OpenBrowser(_lastHover.Link);
+                    var point = e.GetCurrentPoint(this);
+                    var link = _lastHover.Link;
+
+                    if (point.Properties.IsLeftButtonPressed)
+                    {
+                        Native.OS.OpenBrowser(link);
+                    }
+                    else if (point.Properties.IsRightButtonPressed)
+                    {
+                        var open = new MenuItem();
+                        open.Header = App.Text("IssueLinkCM.OpenInBrowser");
+                        open.Icon = App.CreateMenuIcon("Icons.OpenWith");
+                        open.Click += (_, ev) =>
+                        {
+                            ev.Handled = true;
+
+                            var parentView = this.FindAncestorOfType<CommitBaseInfo>();
+                            if (parentView is { DataContext: ViewModels.CommitDetail detail })
+                                detail.NavigateTo(link);
+                        };
+
+                        var copy = new MenuItem();
+                        copy.Header = App.Text("IssueLinkCM.CopyLink");
+                        copy.Icon = App.CreateMenuIcon("Icons.Copy");
+                        copy.Click += (_, ev) =>
+                        {
+                            App.CopyText(link);
+                            ev.Handled = true;
+                        };
+
+                        var menu = new ContextMenu();
+                        menu.Items.Add(open);
+                        menu.Items.Add(copy);
+                        menu.Open(this);
+                    }
                 }
 
                 e.Handled = true;
diff --git a/src/Views/ContextMenuExtension.cs b/src/Views/ContextMenuExtension.cs
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
@@ -706,7 +706,7 @@ private void OnCommitListContextRequested(object sender, ContextRequestedEventAr
             if (DataContext is ViewModels.Histories histories && sender is ListBox { SelectedItems: { Count: > 0 } } list)
             {
                 var menu = histories.MakeContextMenu(list);
-                list.OpenContextMenu(menu);
+                menu?.Open(list);
             }
             e.Handled = true;
         }
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
@@ -250,7 +250,7 @@ private void OnOpenWorkspaceMenu(object sender, RoutedEventArgs e)
             if (sender is Button btn && DataContext is ViewModels.Launcher launcher)
             {
                 var menu = launcher.CreateContextForWorkspace();
-                btn.OpenContextMenu(menu);
+                menu?.Open(btn);
             }
 
             e.Handled = true;
diff --git a/src/Views/LauncherTabBar.axaml.cs b/src/Views/LauncherTabBar.axaml.cs
@@ -234,7 +234,7 @@ private void OnTabContextRequested(object sender, ContextRequestedEventArgs e)
             if (sender is Border border && DataContext is ViewModels.Launcher vm)
             {
                 var menu = vm.CreateContextForPageTab(border.DataContext as ViewModels.LauncherPage);
-                border.OpenContextMenu(menu);
+                menu?.Open(border);
             }
 
             e.Handled = true;
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
@@ -189,7 +189,7 @@ private void OnSubmoduleContextRequested(object sender, ContextRequestedEventArg
             if (sender is ListBox { SelectedItem: Models.Submodule submodule } grid && DataContext is ViewModels.Repository repo)
             {
                 var menu = repo.CreateContextMenuForSubmodule(submodule.Path);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
             }
 
             e.Handled = true;
@@ -210,7 +210,7 @@ private void OnWorktreeContextRequested(object sender, ContextRequestedEventArgs
             if (sender is ListBox { SelectedItem: Models.Worktree worktree } grid && DataContext is ViewModels.Repository repo)
             {
                 var menu = repo.CreateContextMenuForWorktree(worktree);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
             }
 
             e.Handled = true;
diff --git a/src/Views/RepositoryToolbar.axaml.cs b/src/Views/RepositoryToolbar.axaml.cs
@@ -17,7 +17,7 @@ private void OpenWithExternalTools(object sender, RoutedEventArgs e)
             if (sender is Button button && DataContext is ViewModels.Repository repo)
             {
                 var menu = repo.CreateContextMenuForExternalTools();
-                button.OpenContextMenu(menu);
+                menu?.Open(button);
                 e.Handled = true;
             }
         }
@@ -72,32 +72,32 @@ private void StashAll(object _, RoutedEventArgs e)
 
         private void OpenGitFlowMenu(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.Repository repo)
+            if (DataContext is ViewModels.Repository repo && sender is Control control)
             {
                 var menu = repo.CreateContextMenuForGitFlow();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
             }
 
             e.Handled = true;
         }
 
         private void OpenGitLFSMenu(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.Repository repo)
+            if (DataContext is ViewModels.Repository repo && sender is Control control)
             {
                 var menu = repo.CreateContextMenuForGitLFS();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
             }
 
             e.Handled = true;
         }
 
         private void OpenCustomActionMenu(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.Repository repo)
+            if (DataContext is ViewModels.Repository repo && sender is Control control)
             {
                 var menu = repo.CreateContextMenuForCustomAction();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
             }
 
             e.Handled = true;
diff --git a/src/Views/RevisionCompare.axaml.cs b/src/Views/RevisionCompare.axaml.cs
@@ -15,7 +15,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
             if (DataContext is ViewModels.RevisionCompare vm && sender is ChangeCollectionView view)
             {
                 var menu = vm.CreateChangeContextMenu();
-                view.OpenContextMenu(menu);
+                menu?.Open(view);
             }
 
             e.Handled = true;
diff --git a/src/Views/RevisionFileTreeView.axaml.cs b/src/Views/RevisionFileTreeView.axaml.cs
@@ -229,7 +229,7 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
                 if (obj.Type != Models.ObjectType.Tree)
                 {
                     var menu = vm.CreateRevisionFileContextMenu(obj);
-                    grid.OpenContextMenu(menu);
+                    menu?.Open(grid);
                 }
             }
 
diff --git a/src/Views/RevisionFiles.axaml.cs b/src/Views/RevisionFiles.axaml.cs
@@ -95,8 +95,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
 
             var menu = new ContextMenu();
             menu.Items.Add(copy);
+            menu.Open(TextArea.TextView);
 
-            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 
diff --git a/src/Views/StashesPage.axaml.cs b/src/Views/StashesPage.axaml.cs
@@ -28,7 +28,7 @@ private void OnStashContextRequested(object sender, ContextRequestedEventArgs e)
             if (DataContext is ViewModels.StashesPage vm && sender is Border border)
             {
                 var menu = vm.MakeContextMenu(border.DataContext as Models.Stash);
-                border.OpenContextMenu(menu);
+                menu?.Open(border);
             }
             e.Handled = true;
         }
@@ -38,7 +38,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e
             if (DataContext is ViewModels.StashesPage vm && sender is Grid grid)
             {
                 var menu = vm.MakeContextMenuForChange(grid.DataContext as Models.Change);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
             }
             e.Handled = true;
         }
diff --git a/src/Views/TagsView.axaml.cs b/src/Views/TagsView.axaml.cs
@@ -225,7 +225,7 @@ private void OnRowContextRequested(object sender, ContextRequestedEventArgs e)
             if (selected != null && DataContext is ViewModels.Repository repo)
             {
                 var menu = repo.CreateContextMenuForTag(selected);
-                control.OpenContextMenu(menu);
+                menu?.Open(control);
             }
 
             e.Handled = true;
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
@@ -589,8 +589,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs
 
             var menu = new ContextMenu();
             menu.Items.Add(copy);
+            menu.Open(TextArea.TextView);
 
-            TextArea.TextView.OpenContextMenu(menu);
             e.Handled = true;
         }
 
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
@@ -117,7 +117,7 @@ private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs
             if (sender is Grid { DataContext: ViewModels.RepositoryNode node } grid)
             {
                 var menu = ViewModels.Welcome.Instance.CreateContextMenu(node);
-                grid.OpenContextMenu(menu);
+                menu?.Open(grid);
                 e.Handled = true;
             }
         }
diff --git a/src/Views/WorkingCopy.axaml.cs b/src/Views/WorkingCopy.axaml.cs
@@ -31,27 +31,27 @@ private void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
             {
                 var menu = vm.CreateContextMenuForCommitMessages();
                 menu.Placement = PlacementMode.TopEdgeAlignedLeft;
-                button.OpenContextMenu(menu);
+                menu?.Open(button);
                 e.Handled = true;
             }
         }
 
         private void OnUnstagedContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.WorkingCopy vm)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control)
             {
                 var menu = vm.CreateContextMenuForUnstagedChanges();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
                 e.Handled = true;
             }
         }
 
         private void OnStagedContextRequested(object sender, ContextRequestedEventArgs e)
         {
-            if (DataContext is ViewModels.WorkingCopy vm)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control)
             {
                 var menu = vm.CreateContextMenuForStagedChanges();
-                (sender as Control)?.OpenContextMenu(menu);
+                menu?.Open(control);
                 e.Handled = true;
             }
         }
@@ -136,10 +136,10 @@ private void OnUnstageSelectedButtonClicked(object _, RoutedEventArgs e)
 
         private void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
         {
-            if (DataContext is ViewModels.WorkingCopy vm)
+            if (DataContext is ViewModels.WorkingCopy vm && sender is Control control)
             {
                 var menu = vm.CreateContextForOpenAI();
-                (sender as Button)?.OpenContextMenu(menu);
+                menu?.Open(control);
             }
 
             e.Handled = true;

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public string Executable`
`30`	`30`
`31`	`31`	`public string Arguments`
`32`	`32`	`{`
`33`		`- get => _arguments;`
	`33`	`+ get => _arguments;`
`34`	`34`	`set => SetProperty(ref _arguments, value);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -325,8 +325,8 @@ private string FindVisualStudio()`
`325`	`325`	`if (localMachine.OpenSubKey(@"SOFTWARE\Classes\VisualStudio.Launcher.sln\CLSID") is Microsoft.Win32.RegistryKey launcher)`
`326`	`326`	`{`
`327`	`327`	`// Get actual path to the executable`
`328`		`- if (launcher.GetValue(string.Empty) is string CLSID &&`
`329`		`- localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv &&`
	`328`	`+ if (launcher.GetValue(string.Empty) is string CLSID &&`
	`329`	`+ localMachine.OpenSubKey(@$"SOFTWARE\Classes\CLSID\{CLSID}\LocalServer32") is Microsoft.Win32.RegistryKey devenv &&`
`330`	`330`	`devenv.GetValue(string.Empty) is string localServer32)`
`331`	`331`	`{`
`332`	`332`	`return localServer32!.Trim('\"');`
Original file line number	Diff line number	Diff line change
`@@ -407,8 +407,8 @@ private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs`
`407`	`407`
`408`	`408`	`var menu = new ContextMenu();`
`409`	`409`	`menu.Items.Add(copy);`
	`410`	`+ menu.Open(TextArea.TextView);`
`410`	`411`
`411`		`- TextArea.TextView.OpenContextMenu(menu);`
`412`	`412`	`e.Handled = true;`
`413`	`413`	`}`
`414`	`414`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e`
`15`	`15`	`if (DataContext is ViewModels.BranchCompare vm && sender is ChangeCollectionView view)`
`16`	`16`	`{`
`17`	`17`	`var menu = vm.CreateChangeContextMenu();`
`18`		`- view.OpenContextMenu(menu);`
	`18`	`+ menu?.Open(view);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`e.Handled = true;`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2)`
`374`	`374`	`if (selected.Count == 1 && selected[0] is ViewModels.BranchTreeNode { Backend: Models.Remote remote })`
`375`	`375`	`{`
`376`	`376`	`var menu = repo.CreateContextMenuForRemote(remote);`
`377`		`- this.OpenContextMenu(menu);`
	`377`	`+ menu?.Open(this);`
`378`	`378`	`return;`
`379`	`379`	`}`
`380`	`380`
`@@ -391,7 +391,7 @@ private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2)`
`391`	`391`	`var menu = branch.IsLocal ?`
`392`	`392`	`repo.CreateContextMenuForLocalBranch(branch) :`
`393`	`393`	`repo.CreateContextMenuForRemoteBranch(branch);`
`394`		`- this.OpenContextMenu(menu);`
	`394`	`+ menu?.Open(this);`
`395`	`395`	`}`
`396`	`396`	`else if (branches.Find(x => x.IsCurrent) == null)`
`397`	`397`	`{`
`@@ -405,7 +405,7 @@ private void OnTreeContextRequested(object _1, ContextRequestedEventArgs _2)`
`405`	`405`	`ev.Handled = true;`
`406`	`406`	`};`
`407`	`407`	`menu.Items.Add(deleteMulti);`
`408`		`- this.OpenContextMenu(menu);`
	`408`	`+ menu?.Open(this);`
`409`	`409`	`}`
`410`	`410`	`}`
`411`	`411`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private void OnCopyCommitSHA(object sender, RoutedEventArgs e)`
`68`	`68`
`69`	`69`	`private void OnOpenWebLink(object sender, RoutedEventArgs e)`
`70`	`70`	`{`
`71`		`- if (DataContext is ViewModels.CommitDetail detail)`
	`71`	`+ if (DataContext is ViewModels.CommitDetail detail && sender is Control control)`
`72`	`72`	`{`
`73`	`73`	`var links = WebLinks;`
`74`	`74`	`if (links.Count > 1)`
`@@ -88,7 +88,7 @@ private void OnOpenWebLink(object sender, RoutedEventArgs e)`
`88`	`88`	`menu.Items.Add(item);`
`89`	`89`	`}`
`90`	`90`
`91`		`- (sender as Control)?.OpenContextMenu(menu);`
	`91`	`+ menu?.Open(control);`
`92`	`92`	`}`
`93`	`93`	`else if (links.Count == 1)`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e`
`16`	`16`	`DataContext is ViewModels.CommitDetail vm)`
`17`	`17`	`{`
`18`	`18`	`var menu = vm.CreateChangeContextMenu(selected[0]);`
`19`		`- view.OpenContextMenu(menu);`
	`19`	`+ menu?.Open(view);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`e.Handled = true;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e`
`26`	`26`	`if (DataContext is ViewModels.CommitDetail detail && sender is Grid grid && grid.DataContext is Models.Change change)`
`27`	`27`	`{`
`28`	`28`	`var menu = detail.CreateChangeContextMenu(change);`
`29`		`- grid.OpenContextMenu(menu);`
	`29`	`+ menu?.Open(grid);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`e.Handled = true;`