Merge pull request #5838 from mstv/feature/f3_opens_difftool_for_png

Implement F3 to open difftool for .png
gitextensions · Dec 21, 2018 · e5878bc · e5878bc
2 parents ef1b946 + 00de6d3
commit e5878bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs
@@ -1112,13 +1112,14 @@ private void ShowChanges(GitItemStatus item, bool staged)
 
         private async Task SetSelectedDiffAsync(GitItemStatus item, bool staged)
         {
+            Action openWithDiffTool = () => (staged ? stagedOpenDifftoolToolStripMenuItem9 : openWithDifftoolToolStripMenuItem).PerformClick();
             if (item.Name.EndsWith(".png"))
             {
-                await SelectedDiff.ViewFileAsync(item.Name);
+                await SelectedDiff.ViewFileAsync(item.Name, openWithDiffTool);
             }
             else if (item.IsTracked)
             {
-                SelectedDiff.ViewCurrentChanges(item, staged, () => (staged ? stagedOpenDifftoolToolStripMenuItem9 : openWithDifftoolToolStripMenuItem).PerformClick());
+                SelectedDiff.ViewCurrentChanges(item, staged, openWithDiffTool);
             }
             else
             {

diff --git a/GitUI/Editor/FileViewer.cs b/GitUI/Editor/FileViewer.cs
@@ -343,7 +343,7 @@ public ArgumentString GetExtraDiffArguments()
             };
         }
 
-        public Task ViewFileAsync(string fileName)
+        public Task ViewFileAsync(string fileName, [CanBeNull] Action openWithDifftool = null)
         {
             return ShowOrDeferAsync(
                 fileName,
@@ -352,7 +352,7 @@ public Task ViewFileAsync(string fileName)
                     getImage: GetImage,
                     getFileText: GetFileText,
                     getSubmoduleText: () => LocalizationHelpers.GetSubmoduleText(Module, fileName.TrimEnd('/'), ""),
-                    openWithDifftool: null /* not implemented */));
+                    openWithDifftool));
 
             Image GetImage()
             {
@@ -770,7 +770,7 @@ private Task ViewItemAsync(string fileName, Func<Image> getImage, Func<string> g
                                 }
 
                                 PictureBox.Image = image == null ? null : DpiUtil.Scale(image);
-                                internalFileViewer.SetText("", () => { });
+                                internalFileViewer.SetText("", openWithDifftool);
                             });
             }