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

Remove pointless indirection from `BookmarksBranchesBox` events

This commit is contained in:
YoshiRulz 2025-02-10 09:19:01 +10:00
parent b33d7f5ce4
commit 59be77248a
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
4 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -31,12 +31,6 @@ namespace BizHawk.Client.EmuHawk
Load, Update, Text, Remove, None
}
public Action<int> LoadedCallback { get; set; }
public Action<int> SavedCallback { get; set; }
public Action<int> RemovedCallback { get; set; }
public TAStudio Tastudio { get; set; }
public IDialogController DialogController => Tastudio.MainForm;
@ -227,7 +221,7 @@ namespace BizHawk.Client.EmuHawk
private void AddBranchToolStripMenuItem_Click(object sender, EventArgs e)
{
Branch();
SavedCallback?.Invoke(Branches.Count - 1);
Tastudio.BranchSavedCallback?.Invoke(Branches.Count - 1);
Tastudio.MainForm.AddOnScreenMessage($"Added branch {Branches.Current + 1}");
}
@ -235,7 +229,7 @@ namespace BizHawk.Client.EmuHawk
{
Branch();
EditBranchTextPopUp(Branches.Current);
SavedCallback?.Invoke(Branches.Count - 1);
Tastudio.BranchSavedCallback?.Invoke(Branches.Count - 1);
Tastudio.MainForm.AddOnScreenMessage($"Added branch {Branches.Current + 1}");
}
@ -258,7 +252,7 @@ namespace BizHawk.Client.EmuHawk
if (!BranchView.AnyRowsSelected) return false; // why'd we do all that then
var success = LoadSelectedBranch();
LoadedCallback?.Invoke(BranchView.FirstSelectedRowIndex);
Tastudio.BranchLoadedCallback?.Invoke(BranchView.FirstSelectedRowIndex);
return success;
}
@ -285,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
Branches.Replace(SelectedBranch, branch);
Movie.TasStateManager.Capture(Tastudio.Emulator.Frame, new BufferedStatable(branch.CoreData));
Tastudio.RefreshDialog();
SavedCallback?.Invoke(Branches.Current);
Tastudio.BranchSavedCallback?.Invoke(Branches.Current);
Tastudio.MainForm.AddOnScreenMessage($"Saved branch {Branches.Current + 1}");
}
@ -330,7 +324,7 @@ namespace BizHawk.Client.EmuHawk
{
_backupBranch = branches[index].Clone();
Branches.Remove(branches[index]);
RemovedCallback?.Invoke(index);
Tastudio.BranchRemovedCallback?.Invoke(index);
Tastudio.MainForm.AddOnScreenMessage($"Removed branch {index + 1}");
if (index == Branches.Current)
@ -358,7 +352,7 @@ namespace BizHawk.Client.EmuHawk
if (_branchUndo == BranchUndo.Load)
{
LoadBranch(_backupBranch);
LoadedCallback?.Invoke(Branches.IndexOf(_backupBranch));
Tastudio.BranchLoadedCallback?.Invoke(Branches.IndexOf(_backupBranch));
Tastudio.MainForm.AddOnScreenMessage("Branch Load canceled");
}
else if (_branchUndo == BranchUndo.Update)
@ -367,7 +361,7 @@ namespace BizHawk.Client.EmuHawk
if (branch != null)
{
Branches.Replace(branch, _backupBranch);
SavedCallback?.Invoke(Branches.IndexOf(_backupBranch));
Tastudio.BranchSavedCallback?.Invoke(Branches.IndexOf(_backupBranch));
Tastudio.MainForm.AddOnScreenMessage("Branch Update canceled");
}
}
@ -385,7 +379,7 @@ namespace BizHawk.Client.EmuHawk
{
Branches.Add(_backupBranch);
BranchView.RowCount = Branches.Count;
SavedCallback?.Invoke(Branches.IndexOf(_backupBranch));
Tastudio.BranchSavedCallback?.Invoke(Branches.IndexOf(_backupBranch));
Tastudio.MainForm.AddOnScreenMessage("Branch Removal canceled");
}

15
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Callbacks.cs
View File

@ -18,20 +18,5 @@ namespace BizHawk.Client.EmuHawk
{
GreenzoneInvalidatedCallback?.Invoke(index);
}
private void BranchLoaded(int index)
{
BranchLoadedCallback?.Invoke(index);
}
private void BranchSaved(int index)
{
BranchSavedCallback?.Invoke(index);
}
private void BranchRemoved(int index)
{
BranchRemovedCallback?.Invoke(index);
}
}
}

3
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs generated
View File

@ -1101,11 +1101,8 @@ namespace BizHawk.Client.EmuHawk
// BookMarkControl
//
this.BookMarkControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.BookMarkControl.LoadedCallback = null;
this.BookMarkControl.Location = new System.Drawing.Point(0, 0);
this.BookMarkControl.Name = "BookMarkControl";
this.BookMarkControl.RemovedCallback = null;
this.BookMarkControl.SavedCallback = null;
this.BookMarkControl.Size = new System.Drawing.Size(200, 183);
this.BookMarkControl.TabIndex = 8;
this.BookMarkControl.Tastudio = null;

3
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -145,9 +145,6 @@ namespace BizHawk.Client.EmuHawk
TasView.PointedCellChanged += TasView_PointedCellChanged;
LastPositionFrame = -1;
BookMarkControl.LoadedCallback = BranchLoaded;
BookMarkControl.SavedCallback = BranchSaved;
BookMarkControl.RemovedCallback = BranchRemoved;
TasView.MouseLeave += TAStudio_MouseLeave;
TasView.CellHovered += (_, e) =>
{