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

slight refactor - MarkerControl.AddMarker, force the caller to pass in the frame instead of implicitely assuming Tastudio.Emulator.Frame when one is not passed on, only 2 places didn't pass a value in anyway

This commit is contained in:
adelikat 2020-08-23 19:27:21 -05:00
parent 6501c48b13
commit 83686a5a15
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -152,13 +152,13 @@ namespace BizHawk.Client.EmuHawk
private void AddMarkerToolStripMenuItem_Click(object sender, EventArgs e)
{
AddMarker();
AddMarker(Tastudio.Emulator.Frame);
MarkerView_SelectedIndexChanged(null, null);
}
private void AddMarkerWithTextToolStripMenuItem_Click(object sender, EventArgs e)
{
AddMarker(editText: true);
AddMarker(Tastudio.Emulator.Frame, true);
MarkerView_SelectedIndexChanged(null, null);
}
@ -177,21 +177,18 @@ namespace BizHawk.Client.EmuHawk
MarkerView.RowCount = Markers.Count;
}
public void AddMarker(bool editText = false, int? frame = null)
public void AddMarker(int frame, bool editText = false)
{
// feos: we specify the selected frame if we call this from TasView, otherwise marker should be added to the emulated frame
var markerFrame = frame ?? Tastudio.Emulator.Frame;
if (editText)
{
var i = new InputPrompt
{
Text = $"Marker for frame {markerFrame}",
Text = $"Marker for frame {frame}",
TextInputType = InputPrompt.InputType.Text,
Message = "Enter a message",
InitialValue =
Markers.IsMarker(markerFrame) ?
Markers.PreviousOrCurrent(markerFrame).Message :
Markers.IsMarker(frame) ?
Markers.PreviousOrCurrent(frame).Message :
""
};
@ -199,16 +196,16 @@ namespace BizHawk.Client.EmuHawk
point.Offset(i.Width / -2, i.Height / -2);
var result = i.ShowHawkDialog(position: point);
if (result == DialogResult.OK)
if (result.IsOk())
{
Markers.Add(new TasMovieMarker(markerFrame, i.PromptText));
Markers.Add(new TasMovieMarker(frame, i.PromptText));
UpdateTextColumnWidth();
UpdateValues();
}
}
else
{
Markers.Add(new TasMovieMarker(markerFrame));
Markers.Add(new TasMovieMarker(frame));
UpdateValues();
}

2
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -932,7 +932,7 @@ namespace BizHawk.Client.EmuHawk
else
{
ClearLeftMouseStates();
MarkerControl.AddMarker(false, TasView.CurrentCell.RowIndex.Value);
MarkerControl.AddMarker(TasView.CurrentCell.RowIndex.Value, false);
}
}
}

4
src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
View File

@ -727,13 +727,13 @@ namespace BizHawk.Client.EmuHawk
foreach (var index in TasView.SelectedRows)
{
MarkerControl.AddMarker(false, index);
MarkerControl.AddMarker(index, false);
}
}
private void SetMarkerWithTextMenuItem_Click(object sender, EventArgs e)
{
MarkerControl.AddMarker(true, TasView.SelectedRows.FirstOrDefault());
MarkerControl.AddMarker(TasView.SelectedRows.FirstOrDefault(), true);
}
private void RemoveMarkersMenuItem_Click(object sender, EventArgs e)