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

Tastudio - fix issue #446 - don't greenzone between the mouse down and mouse up events when editing input

This commit is contained in:
adelikat 2015-06-28 10:43:45 -04:00
parent ac52749941
commit 13044547e4
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.Common/movie/tasproj/TasMovie.Editing.cs
View File

@ -23,7 +23,10 @@ namespace BizHawk.Client.Common
LagLog.RemoveFrom(frame);
LagLog[frame] = Global.Emulator.AsInputPollable().IsLagFrame;
StateManager.Capture();
if (!SupressGreenzonging)
{
StateManager.Capture();
}
if (frame != 0)
ChangeLog.SetGeneralRedo();

13
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -239,13 +239,18 @@ namespace BizHawk.Client.Common
return base.GetInputState(frame);
}
public bool SupressGreenzonging { get; set; }
public void GreenzoneCurrentFrame()
{
LagLog[Global.Emulator.Frame] = Global.Emulator.AsInputPollable().IsLagFrame;
if (!StateManager.HasState(Global.Emulator.Frame))
if (!SupressGreenzonging)
{
StateManager.Capture();
LagLog[Global.Emulator.Frame] = Global.Emulator.AsInputPollable().IsLagFrame;
if (!StateManager.HasState(Global.Emulator.Frame))
{
StateManager.Capture();
}
}
}

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

@ -285,6 +285,7 @@ namespace BizHawk.Client.EmuHawk
if (e.Button == MouseButtons.Left)
{
CurrentTasMovie.SupressGreenzonging = true; // This is necessary because we will invalidate, but we won't navigate until mouse up, during that time the user may have emulated frames and we don't want to caputre states for those
_leftButtonHeld = true;
// SuuperW: Exit float editing mode, or re-enter mouse editing
if (_floatEditRow != -1)
@ -422,6 +423,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (e.Button == MouseButtons.Left)
{
CurrentTasMovie.SupressGreenzonging = false;
_startMarkerDrag = false;
_startFrameDrag = false;
_startBoolDrawColumn = string.Empty;