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

Fixed not going to correct frame when clicking in Marker Column in TAStudio.

This commit is contained in:
kylelyk 2014-08-20 19:52:01 +00:00
parent 6bc604e5a5
commit b76edcd6e8
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,6 +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>
private void CalculatePointedCell(int x, int y)
{
int? newRow;
@ -69,7 +74,7 @@ namespace BizHawk.Client.EmuHawk
break;
}
var rowHeight = this.LineHeight + 5; // 5 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;

2
BizHawk.Client.EmuHawk/CustomControls/VirtualListView.cs
View File

@ -444,7 +444,7 @@ namespace BizHawk.Client.EmuHawk
SetStyle(ControlStyles.Opaque, true);
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
var LineHeight = this.Font.Height + 5;
LineHeight = this.Font.Height + 5;
}
~VirtualListView()

2
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -2515,7 +2515,7 @@ namespace BizHawk.Client.EmuHawk
bool isRewinding = false;
if (Global.Rewinder.RewindActive && (Global.ClientControls["Rewind"] || PressRewind)
&& !Global.MovieSession.Movie.IsRecording) // Rewind isn't "bulletproof" and can desync a recoridng movie!
&& !Global.MovieSession.Movie.IsRecording) // Rewind isn't "bulletproof" and can desync a recording movie!
{
Global.Rewinder.Rewind(1);
suppressCaptureRewind = true;

2
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IControlMainForm.cs
View File

@ -13,7 +13,7 @@
public void StopMovie()
{
this.Focus();
NewTasMenuItem_Click(null, null);
//NewTasMenuItem_Click(null, null);
}
}
}

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

@ -195,7 +195,7 @@ namespace BizHawk.Client.EmuHawk
if (TasView.PointedCell.Column == MarkerColumnName)
{
_startMarkerDrag = true;
GoToFrame(TasView.PointedCell.Row.Value - 1);
GoToFrame(TasView.PointedCell.Row.Value);
}
else if (TasView.PointedCell.Column == FrameColumnName)
{