Skip to content

Commit

Permalink
RevDiff: Diff submenu: Keep Second before First
Browse files Browse the repository at this point in the history
  • Loading branch information
gerhardol committed Jun 25, 2020
1 parent 32ea083 commit 1ec7cef
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 19 deletions.
31 changes: 16 additions & 15 deletions GitUI/CommandsDialogs/RevisionDiffControl.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions GitUI/CommandsDialogs/RevisionDiffControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -720,9 +720,9 @@ private void openWithDifftoolToolStripMenuItem_DropDownOpening(object sender, Ev

if (revisions.Any())
{
selectedDiffCaptionMenuItem.Text = _selectedRevision + (DescribeRevision(revisions) ?? string.Empty);
selectedDiffCaptionMenuItem.Visible = true;
MenuUtil.SetAsCaptionMenuItem(selectedDiffCaptionMenuItem, DiffContextMenu);
secondDiffCaptionMenuItem.Text = _selectedRevision + (DescribeRevision(revisions) ?? string.Empty);
secondDiffCaptionMenuItem.Visible = true;
MenuUtil.SetAsCaptionMenuItem(secondDiffCaptionMenuItem, DiffContextMenu);

firstDiffCaptionMenuItem.Text = _firstRevision.Text +
(DescribeRevision(DiffFiles.SelectedItems.FirstRevs().ToList()) ?? string.Empty);
Expand All @@ -732,7 +732,7 @@ private void openWithDifftoolToolStripMenuItem_DropDownOpening(object sender, Ev
else
{
firstDiffCaptionMenuItem.Visible = false;
selectedDiffCaptionMenuItem.Visible = false;
secondDiffCaptionMenuItem.Visible = false;
}

firstToSelectedToolStripMenuItem.Enabled = _revisionDiffContextMenuController.ShouldShowMenuFirstToSelected(selectionInfo);
Expand Down

0 comments on commit 1ec7cef

Please sign in to comment.