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

TASTudio - when showing the marker naming pop up, clear out all the states that would have been done by the mouse up event that hasn't happened yet, prevents being able to highlight frames while the pop up is open

This commit is contained in:
adelikat 2015-07-18 12:33:03 -04:00
parent aebd7f3dae
commit 140ce0af16
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -469,6 +469,26 @@ namespace BizHawk.Client.EmuHawk
}
}
private void ClearLeftMouseStates()
{
_startCursorDrag = false;
_startFrameDrag = false;
_startBoolDrawColumn = string.Empty;
_startFloatDrawColumn = string.Empty;
// Exit float editing if value was changed with cursor
if (_floatEditRow != -1 && _floatPaintState != CurrentTasMovie.GetFloatState(_floatEditRow, _floatEditColumn))
{
_floatEditRow = -1;
RefreshDialog();
}
_floatPaintState = 0;
_floatEditYPos = -1;
_leftButtonHeld = false;
if (_floatEditRow == -1)
CurrentTasMovie.ChangeLog.EndBatch();
}
private void TasView_MouseUp(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right && !TasView.IsPointingAtColumnHeader && !_supressContextMenu)
@ -477,22 +497,7 @@ namespace BizHawk.Client.EmuHawk
}
else if (e.Button == MouseButtons.Left)
{
_startCursorDrag = false;
_startFrameDrag = false;
_startBoolDrawColumn = string.Empty;
_startFloatDrawColumn = string.Empty;
// Exit float editing if value was changed with cursor
if (_floatEditRow != -1 && _floatPaintState != CurrentTasMovie.GetFloatState(_floatEditRow, _floatEditColumn))
{
_floatEditRow = -1;
RefreshDialog();
}
_floatPaintState = 0;
_floatEditYPos = -1;
_leftButtonHeld = false;
if (_floatEditRow == -1)
CurrentTasMovie.ChangeLog.EndBatch();
ClearLeftMouseStates();
}
if (e.Button == System.Windows.Forms.MouseButtons.Right)
@ -556,6 +561,7 @@ namespace BizHawk.Client.EmuHawk
}
else
{
ClearLeftMouseStates();
CallAddMarkerPopUp(TasView.CurrentCell.RowIndex.Value);
}
}