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

TAStudio - move the rightButtonHeld logic inside the TasListView object rather than being tastudio logic

This commit is contained in:
adelikat 2014-07-18 00:04:29 +00:00
parent 8d0d5ef98d
commit e6c99db9ff
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@ namespace BizHawk.Client.EmuHawk
} }
} }
public bool RightButtonHeld { get; set; }
public int? LastSelectedIndex public int? LastSelectedIndex
{ {
get get
@ -127,16 +129,24 @@ namespace BizHawk.Client.EmuHawk
protected override void OnMouseDown(MouseEventArgs e) protected override void OnMouseDown(MouseEventArgs e)
{ {
if (InputPaintingMode) if (e.Button == MouseButtons.Left && InputPaintingMode)
{ {
IsPaintDown = true; IsPaintDown = true;
} }
if (e.Button == MouseButtons.Right)
{
RightButtonHeld = true;
}
base.OnMouseDown(e); base.OnMouseDown(e);
} }
protected override void OnMouseUp(MouseEventArgs e) protected override void OnMouseUp(MouseEventArgs e)
{ {
IsPaintDown = false; IsPaintDown = false;
RightButtonHeld = false;
base.OnMouseUp(e); base.OnMouseUp(e);
} }
} }

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

@ -15,7 +15,6 @@ namespace BizHawk.Client.EmuHawk
private float _floatPaintState; private float _floatPaintState;
private bool _startMarkerDrag; private bool _startMarkerDrag;
private bool _startFrameDrag; private bool _startFrameDrag;
private bool _rightMouseHeld = false;
private readonly Color CurrentFrame_FrameCol = Color.FromArgb(0xCFEDFC); private readonly Color CurrentFrame_FrameCol = Color.FromArgb(0xCFEDFC);
private readonly Color CurrentFrame_InputLog = Color.FromArgb(0xB5E7F7); private readonly Color CurrentFrame_InputLog = Color.FromArgb(0xB5E7F7);
@ -199,10 +198,6 @@ namespace BizHawk.Client.EmuHawk
} }
} }
} }
else if (e.Button == MouseButtons.Right)
{
_rightMouseHeld = true;
}
} }
} }
@ -241,12 +236,11 @@ namespace BizHawk.Client.EmuHawk
_startBoolDrawColumn = string.Empty; _startBoolDrawColumn = string.Empty;
_startFloatDrawColumn = string.Empty; _startFloatDrawColumn = string.Empty;
_floatPaintState = 0; _floatPaintState = 0;
_rightMouseHeld = false;
} }
private void TasView_MouseWheel(object sender, MouseEventArgs e) private void TasView_MouseWheel(object sender, MouseEventArgs e)
{ {
if (_rightMouseHeld && TasView.PointedCell.Row.HasValue) if (TasView.RightButtonHeld && TasView.PointedCell.Row.HasValue)
{ {
if (e.Delta < 0) if (e.Delta < 0)
{ {