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

AutoRestoreLastPosition now works.

This commit is contained in:
kylelyk 2014-08-22 14:42:31 +00:00
parent 491d0588e4
commit b2c3530164
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
View File

@ -51,11 +51,11 @@ namespace BizHawk.Client.EmuHawk
public bool InputPaintingMode { get; set; }
public bool IsPaintDown { get; private set; }
/// <summary>
/// Calculates the column name and row number that the point (x, y) lies in.
/// </summary>
/// <param name="x">X coordinate</param>
/// <param name="y">Y coordinate</param>
/// <summary>
/// Calculates the column name and row number that the point (x, y) lies in.
/// </summary>
/// <param name="x">X coordinate</param>
/// <param name="y">Y coordinate</param>
private void CalculatePointedCell(int x, int y)
{
int? newRow;
@ -74,7 +74,7 @@ namespace BizHawk.Client.EmuHawk
break;
}
var rowHeight = this.LineHeight;// 5 (in VirtualListView) and 6 work here for me, but are they always dependable, how can I get the padding?
var rowHeight = this.LineHeight;// 5 (in VirtualListView) and 6 work here for me, but are they always dependable, how can I get the padding?
var headerHeight = rowHeight + 6;
newRow = ((y - headerHeight) / rowHeight) + this.VScrollPos;

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

@ -201,7 +201,7 @@ namespace BizHawk.Client.EmuHawk
{
_startFrameDrag = true;
}
else
else//User changed input
{
var frame = TasView.PointedCell.Row.Value;
var buttonName = TasView.PointedCell.Column;
@ -212,6 +212,12 @@ namespace BizHawk.Client.EmuHawk
GoToLastEmulatedFrameIfNecessary(TasView.PointedCell.Row.Value);
TasView.Refresh();
if (Global.Config.TAStudioAutoRestoreLastPosition)
{
GlobalWin.MainForm.UnpauseEmulator();
GlobalWin.MainForm.PauseOnFrame = Global.Emulator.Frame;
}
_startBoolDrawColumn = TasView.PointedCell.Column;
_boolPaintState = _currentTasMovie.BoolIsPressed(frame, buttonName);
}

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

@ -276,7 +276,6 @@ namespace BizHawk.Client.EmuHawk
GlobalWin.DisplayManager.NeedsToPaint = true;
TasView.ensureVisible(frame);
RefreshDialog();
}
else
{
@ -401,8 +400,6 @@ namespace BizHawk.Client.EmuHawk
_currentTasMovie.Markers.Add(markerFrame, i.PromptText);
MarkerControl.Refresh();
}
MarkerControl.Refresh();
}
private void UpdateChangesIndicator()