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

tastudio: don't jump to playback when advancing/rewinding 

offscreen marker goto is the only SetVisibleIndex() call that should show playback
tastudio: cursor is not a marker anymore
This commit is contained in:
feos 2015-07-13 20:37:12 +03:00
parent b2b70fb8d9
commit feb14ad948
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
View File

@ -17,7 +17,7 @@ namespace BizHawk.Client.EmuHawk
private bool _boolPaintState;
private float _floatPaintState;
private bool _patternPaint = false;
private bool _startMarkerDrag;
private bool _startCursorDrag;
private bool _startFrameDrag;
private bool _frameDragState;
private bool _supressContextMenu;
@ -82,7 +82,7 @@ namespace BizHawk.Client.EmuHawk
var columnName = column.Name;
if (columnName == MarkerColumnName)
if (columnName == CursorColumnName)
{
if (index == Emulator.Frame && index == GlobalWin.MainForm.PauseOnFrame)
{
@ -117,7 +117,7 @@ namespace BizHawk.Client.EmuHawk
string columnName = column.Name;
if (columnName == MarkerColumnName)
if (columnName == CursorColumnName)
{ // For debugging purposes, let's visually show the state frames
if (VersionInfo.DeveloperBuild && CurrentTasMovie.TasStateManager.HasState(index))
color = Color.FromArgb(0xEEEEEE);
@ -176,7 +176,7 @@ namespace BizHawk.Client.EmuHawk
text = string.Empty;
var columnName = column.Name;
if (columnName == MarkerColumnName)
if (columnName == CursorColumnName)
{
// Do nothing
}
@ -220,7 +220,7 @@ namespace BizHawk.Client.EmuHawk
RefreshDialog();
}
else if (columnName != MarkerColumnName) // TODO: what about float?
else if (columnName != CursorColumnName) // TODO: what about float?
{
foreach (var index in TasView.SelectedRows)
{
@ -330,9 +330,9 @@ namespace BizHawk.Client.EmuHawk
}
}
if (TasView.CurrentCell.Column.Name == MarkerColumnName)
if (TasView.CurrentCell.Column.Name == CursorColumnName)
{
_startMarkerDrag = true;
_startCursorDrag = true;
GoToFrame(TasView.CurrentCell.RowIndex.Value);
}
else if (TasView.CurrentCell.Column.Name == FrameColumnName)
@ -449,7 +449,7 @@ namespace BizHawk.Client.EmuHawk
else if (e.Button == MouseButtons.Left)
{
CurrentTasMovie.SupressGreenzonging = false;
_startMarkerDrag = false;
_startCursorDrag = false;
_startFrameDrag = false;
_startBoolDrawColumn = string.Empty;
_startFloatDrawColumn = string.Empty;
@ -550,7 +550,7 @@ namespace BizHawk.Client.EmuHawk
endVal = e.OldCell.RowIndex.Value;
}
if (_startMarkerDrag)
if (_startCursorDrag)
{
if (e.NewCell.RowIndex.HasValue)
{

12
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
View File

@ -54,7 +54,10 @@ namespace BizHawk.Client.EmuHawk
}
GlobalWin.DisplayManager.NeedsToPaint = true;
SetVisibleIndex(frame);
if (TasPlaybackBox.FollowCursor)
{
SetVisibleIndex(frame);
}
}
else // Get as close as we can then emulate there
{
@ -81,7 +84,10 @@ namespace BizHawk.Client.EmuHawk
Emulator.FrameAdvance(true);
GlobalWin.DisplayManager.NeedsToPaint = true;
SetVisibleIndex(frame);
if (TasPlaybackBox.FollowCursor)
{
SetVisibleIndex(frame);
}
}
else
{
@ -165,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
GoToFrame(marker.Frame);
}
public void SetVisibleIndex(int? indexThatMustBeVisible = null)
public void SetVisibleIndex(int? indexThatMustBeVisible = null)
{
if (!indexThatMustBeVisible.HasValue)
{

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

@ -19,7 +19,7 @@ namespace BizHawk.Client.EmuHawk
public partial class TAStudio : Form, IToolFormAutoConfig, IControlMainform
{
// TODO: UI flow that conveniently allows to start from savestate
private const string MarkerColumnName = "MarkerColumn";
private const string CursorColumnName = "CursorColumn";
private const string FrameColumnName = "FrameColumn";
private readonly List<TasClipboardEntry> _tasClipboard = new List<TasClipboardEntry>();
@ -224,7 +224,7 @@ namespace BizHawk.Client.EmuHawk
private void SetUpColumns()
{
TasView.AllColumns.Clear();
AddColumn(MarkerColumnName, string.Empty, 18);
AddColumn(CursorColumnName, string.Empty, 18);
AddColumn(FrameColumnName, "Frame#", 68);
var columnNames = GenerateColumnNames();