ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TAStudio undo history form: make use of TAStudio methods, so that rewinds necessary to stay inside the greenzone happen. (also refresh after "to here" un/redo)

This commit is contained in:
SuuperW 2021-01-15 11:16:23 -06:00
parent b6d77586af
commit 69af966a2d
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs
View File

@ -75,13 +75,13 @@ namespace BizHawk.Client.EmuHawk
private void UndoButton_Click(object sender, EventArgs e) private void UndoButton_Click(object sender, EventArgs e)
{ {
Log.Undo(); _tastudio.UndoExternal();
_tastudio.RefreshDialog(); _tastudio.RefreshDialog();
} }
private void RedoButton_Click(object sender, EventArgs e) private void RedoButton_Click(object sender, EventArgs e)
{ {
Log.Redo(); _tastudio.RedoExternal();
_tastudio.RefreshDialog(); _tastudio.RefreshDialog();
} }
@ -89,20 +89,27 @@ namespace BizHawk.Client.EmuHawk
? HistoryView.SelectedRows.First() ? HistoryView.SelectedRows.First()
: -1; : -1;
private void HistoryView_DoubleClick(object sender, EventArgs e) private void UndoToHere(int index)
{ {
if (Log.UndoIndex <= SelectedItem) int earliestFrame = int.MaxValue;
while (Log.UndoIndex > index)
{ {
return; int frame = Log.Undo();
if (frame < earliestFrame)
earliestFrame = frame;
} }
do
{
Log.Undo();
}
while (Log.UndoIndex > SelectedItem);
UpdateValues(); UpdateValues();
// potentially rewind, then update display for TAStudio
if (_tastudio.Emulator.Frame > earliestFrame)
_tastudio.GoToFrame(earliestFrame);
_tastudio.RefreshDialog();
}
private void HistoryView_DoubleClick(object sender, EventArgs e)
{
UndoToHere(SelectedItem);
} }
private void HistoryView_MouseUp(object sender, MouseEventArgs e) private void HistoryView_MouseUp(object sender, MouseEventArgs e)
@ -130,34 +137,25 @@ namespace BizHawk.Client.EmuHawk
private void UndoHereMenuItem_Click(object sender, EventArgs e) private void UndoHereMenuItem_Click(object sender, EventArgs e)
{ {
if (SelectedItem == -1 || Log.UndoIndex < SelectedItem) UndoToHere(SelectedItem);
{
return;
}
do
{
Log.Undo();
}
while (Log.UndoIndex >= SelectedItem);
UpdateValues();
} }
private void RedoHereMenuItem_Click(object sender, EventArgs e) private void RedoHereMenuItem_Click(object sender, EventArgs e)
{ {
if (SelectedItem == -1 || Log.UndoIndex >= SelectedItem) int earliestFrame = int.MaxValue;
while (Log.UndoIndex < SelectedItem)
{ {
return; int frame = Log.Redo();
if (earliestFrame < frame)
earliestFrame = frame;
} }
do
{
Log.Redo();
}
while (Log.UndoIndex < SelectedItem);
UpdateValues(); UpdateValues();
// potentially rewind, then update display for TAStudio
if (_tastudio.Emulator.Frame > earliestFrame)
_tastudio.GoToFrame(earliestFrame);
_tastudio.RefreshDialog();
} }
private void ClearHistoryToHereMenuItem_Click(object sender, EventArgs e) private void ClearHistoryToHereMenuItem_Click(object sender, EventArgs e)