Skip to content

Commit

Permalink
Update MenuBuilder.cs
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Jul 18, 2024
1 parent 18743b2 commit ba24eed
Showing 1 changed file with 21 additions and 6 deletions.
27 changes: 21 additions & 6 deletions src/DiffEngineTray/MenuBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@ static IEnumerable<ToolStripItem> BuildTrackingMenuItems(Tracker tracker)
yield return new MenuButton($"Accept all ({count})", tracker.AcceptAll, Images.AcceptAll);
}

static IEnumerable<ToolStripItem> BuildGroupedMenuItems(Tracker tracker, List<TrackedDelete> deletes, List<TrackedMove> moves)
static IEnumerable<ToolStripItem> BuildGroupedMenuItems(
Tracker tracker,
List<TrackedDelete> deletes,
List<TrackedMove> moves)
{
var groups = deletes.Select(_ => _.Group)
.Concat(moves.Select(_ => _.Group))
Expand All @@ -114,7 +117,11 @@ static IEnumerable<ToolStripItem> BuildGroupedMenuItems(Tracker tracker, List<Tr
}
}

static IEnumerable<ToolStripItem> BuildMovesAndDeletes(string? name, Tracker tracker, List<TrackedDelete> deletes, List<TrackedMove> moves)
static IEnumerable<ToolStripItem> BuildMovesAndDeletes(
string? name,
Tracker tracker,
List<TrackedDelete> deletes,
List<TrackedMove> moves)
{
if (name != null)
{
Expand All @@ -123,7 +130,10 @@ static IEnumerable<ToolStripItem> BuildMovesAndDeletes(string? name, Tracker tra

if (deletes.Count != 0)
{
yield return new MenuButton($"Pending Deletes ({deletes.Count}):", () => tracker.Accept(deletes), Images.Delete);
yield return new MenuButton(
$"Pending Deletes ({deletes.Count}):",
() => tracker.Accept(deletes),
Images.Delete);
foreach (var delete in deletes)
{
yield return BuildDelete(delete, () => tracker.Accept(delete));
Expand All @@ -132,7 +142,10 @@ static IEnumerable<ToolStripItem> BuildMovesAndDeletes(string? name, Tracker tra

if (moves.Count != 0)
{
yield return new MenuButton($"Pending Moves ({moves.Count}):", () => tracker.Accept(moves), Images.Accept);
yield return new MenuButton(
$"Pending Moves ({moves.Count}):",
() => tracker.Accept(moves),
Images.Accept);
foreach (var move in moves)
{
yield return BuildMove(
Expand All @@ -147,8 +160,10 @@ static IEnumerable<ToolStripItem> BuildMovesAndDeletes(string? name, Tracker tra

static ToolStripItem BuildDelete(TrackedDelete delete, Action accept)
{
var menu = new ToolStripDropDownButton($"{delete.Name}");
menu.DropDownDirection = ToolStripDropDownDirection.Left;
var menu = new ToolStripDropDownButton($"{delete.Name}")
{
DropDownDirection = ToolStripDropDownDirection.Left
};
menu.DropDownItems.Add(new MenuButton("Accept delete", accept));
menu.DropDownItems.Add(BuildShowInExplorer(delete.File));
return menu;
Expand Down

0 comments on commit ba24eed

Please sign in to comment.