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

tastudio analog editing: Escape key cancels all changes 

also prevent marker set from entering analog mode and releasing the LMB over the frame column (might happen after drag editing)
This commit is contained in:
feos 2016-11-13 16:42:24 +03:00
parent dbc35224e6
commit 578b688d51
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk
private string _startFloatDrawColumn = string.Empty;
private bool _boolPaintState;
private float _floatPaintState;
private float _floatBackupState;
private bool _patternPaint = false;
private bool _startCursorDrag;
private bool _startSelectionDrag;
@ -539,6 +540,7 @@ namespace BizHawk.Client.EmuHawk
floatEditRow = frame;
_floatTypedValue = "";
_floatEditYPos = e.Y;
_floatBackupState = CurrentTasMovie.GetFloatState(_floatEditRow, _floatEditColumn);
_triggerAutoRestore = true;
JumpToGreenzone();
}
@ -699,7 +701,8 @@ namespace BizHawk.Client.EmuHawk
var buttonName = TasView.CurrentCell.Column.Name;
if (TasView.CurrentCell.RowIndex.HasValue &&
buttonName == FrameColumnName)
buttonName == FrameColumnName &&
_floatEditRow == -1)
{
if (Settings.EmptyMarkers)
{
@ -1036,10 +1039,16 @@ namespace BizHawk.Client.EmuHawk
}
else if (e.KeyCode == Keys.Escape)
{
if (_floatEditYPos != -1) // Cancel change from dragging cursor
if (_floatEditYPos != -1)
{
_floatEditYPos = -1;
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, _floatPaintState);
}
if (_floatBackupState != _floatPaintState)
{
CurrentTasMovie.SetFloatState(_floatEditRow, _floatEditColumn, _floatBackupState);
_triggerAutoRestore = true;
JumpToGreenzone();
DoTriggeredAutoRestoreIfNeeded();
}
floatEditRow = -1;
}