Skip to content

Commit a68f4db

Browse files
fix trace redo bug
1 parent 46cbab4 commit a68f4db

3 files changed

Lines changed: 40 additions & 5 deletions

File tree

‎AudioCuesheetEditor.Tests/Services/UI/TraceChangeManagerTests.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using AudioCuesheetEditor.Tests.Utility;
2020
using Microsoft.VisualStudio.TestTools.UnitTesting;
2121
using System;
22+
using System.Collections.Generic;
2223
using System.Linq;
2324

2425
namespace AudioCuesheetEditor.Tests.Services.UI
@@ -112,6 +113,40 @@ public void BulkEdit_AlreadyEnabledBulkEdit_DoesntDropPreviousEdits()
112113
Assert.IsTrue(_traceChangeManager.CanRedo);
113114
}
114115

116+
117+
[TestMethod()]
118+
public void BulkEditFalse_AfterBulkEditAndUndo_ResetsRedoStack()
119+
{
120+
// Arrange
121+
var audiofile = new Audiofile();
122+
var track1 = new Track();
123+
var track2 = new Track();
124+
var track3 = new Track();
125+
_traceChangeManager.BulkEdit = true;
126+
_traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1 }, nameof(Audiofile.Tracks))));
127+
track1.Audiofile = audiofile;
128+
_traceChangeManager.BulkEdit = false;
129+
_traceChangeManager.BulkEdit = true;
130+
_traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1, track2 }, nameof(Audiofile.Tracks))));
131+
track1.Audiofile = audiofile;
132+
track2.Audiofile = audiofile;
133+
_traceChangeManager.BulkEdit = false;
134+
_traceChangeManager.Undo();
135+
_traceChangeManager.BulkEdit = true;
136+
_traceChangeManager.AddChange(new(audiofile, new(new List<Track>() { track1, track2, track3 }, nameof(Audiofile.Tracks))));
137+
track1.Audiofile = audiofile;
138+
track2.Audiofile = audiofile;
139+
track3.Audiofile = audiofile;
140+
_traceChangeManager.BulkEdit = false;
141+
_traceChangeManager.BulkEdit = true;
142+
_traceChangeManager.AddChange(new(track2, new("Testartist", nameof(Track.Artist))));
143+
// Act
144+
_traceChangeManager.BulkEdit = false;
145+
// Assert
146+
Assert.IsTrue(_traceChangeManager.CanUndo);
147+
Assert.IsFalse(_traceChangeManager.CanRedo);
148+
}
149+
115150
[TestMethod()]
116151
public void Undo_SingleChange_UndoesChange()
117152
{

‎AudioCuesheetEditor/Services/UI/TraceChangeManager.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public bool BulkEdit
175175
if (_bulkEditTracedChanges?.Count > 0)
176176
{
177177
_undoStack.Add(new TracedChanges(_bulkEditTracedChanges));
178+
_redoStack.Clear();
178179
TracedObjectHistoryChanged?.Invoke(this, EventArgs.Empty);
179180
}
180181
_bulkEditTracedChanges = null;

‎AudioCuesheetEditor/Shared/AppBar.razor‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ along with Foobar. If not, see
3737
{
3838
<MudButtonGroup Color="Color.Primary" Variant="Variant.Filled" OverrideStyles>
3939
<MudTooltip Text="@_localizer["Undo last edit"]">
40-
<MudIconButton Icon="@Icons.Material.Outlined.Undo" aria-label="undo" Disabled="!TraceChangeManager.CanUndo" OnClick="() => TraceChangeManager.Undo()" />
40+
<MudIconButton Icon="@Icons.Material.Outlined.Undo" aria-label="undo" Disabled="!TraceChangeManager.CanUndo" OnClick="TraceChangeManager.Undo" />
4141
</MudTooltip>
4242
<MudTooltip Text="@_localizer["Redo last edit"]">
43-
<MudIconButton Icon="@Icons.Material.Outlined.Redo" aria-label="redo" Disabled="!TraceChangeManager.CanRedo" OnClick="() => TraceChangeManager.Redo()" />
43+
<MudIconButton Icon="@Icons.Material.Outlined.Redo" aria-label="redo" Disabled="!TraceChangeManager.CanRedo" OnClick="TraceChangeManager.Redo" />
4444
</MudTooltip>
4545
</MudButtonGroup>
4646
}
@@ -90,16 +90,15 @@ along with Foobar. If not, see
9090
</MudAppBar>
9191

9292
@code {
93-
//TODO: Redo not reset when adding a new change (like adding another track)
9493
HotKeysContext? _hotKeysContext;
9594
MudFileUpload<IBrowserFile>? _mudFileUpload;
9695

9796
protected override void OnInitialized()
9897
{
9998
base.OnInitialized();
10099
_hotKeysContext = _hotKeys.CreateContext()
101-
.Add(ModKey.Ctrl, Key.z, () => TraceChangeManager.Undo())
102-
.Add(ModKey.Ctrl, Key.y, () => TraceChangeManager.Redo())
100+
.Add(ModKey.Ctrl, Key.z, TraceChangeManager.Undo)
101+
.Add(ModKey.Ctrl, Key.y, TraceChangeManager.Redo)
103102
.Add(ModKey.Ctrl, Key.s, DownloadProjectfileClicked)
104103
.Add(ModKey.Ctrl, Key.e, DownloadExportClicked)
105104
.Add(ModKey.Ctrl, Key.u, DownloadCuesheetClicked)

0 commit comments

Comments
 (0)