From e6c99db9ffa202bb0cc5c3a688e6397239c5062f Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 18 Jul 2014 00:04:29 +0000
Subject: [PATCH] TAStudio - move the rightButtonHeld logic inside the
 TasListView object rather than being tastudio logic

---
 BizHawk.Client.EmuHawk/CustomControls/TasListView.cs | 12 +++++++++++-
 .../tools/TAStudio/TAStudio.ListView.cs              |  8 +-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
index 2ba43a91e2..e76b7f0a04 100644
--- a/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
+++ b/BizHawk.Client.EmuHawk/CustomControls/TasListView.cs
@@ -18,6 +18,8 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		public bool RightButtonHeld { get; set; }
+
 		public int? LastSelectedIndex
 		{
 			get
@@ -127,16 +129,24 @@ namespace BizHawk.Client.EmuHawk
 
 		protected override void OnMouseDown(MouseEventArgs e)
 		{
-			if (InputPaintingMode)
+			if (e.Button == MouseButtons.Left && InputPaintingMode)
 			{
 				IsPaintDown = true;
 			}
+
+			if (e.Button == MouseButtons.Right)
+			{
+				RightButtonHeld = true;
+			}
+
 			base.OnMouseDown(e);
 		}
 
 		protected override void OnMouseUp(MouseEventArgs e)
 		{
 			IsPaintDown = false;
+			RightButtonHeld = false;
+
 			base.OnMouseUp(e);
 		}
 	}
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index 322baf8db5..4f488eeaa0 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -15,7 +15,6 @@ namespace BizHawk.Client.EmuHawk
 		private float _floatPaintState;
 		private bool _startMarkerDrag;
 		private bool _startFrameDrag;
-		private bool _rightMouseHeld = false;
 
 		private readonly Color CurrentFrame_FrameCol = Color.FromArgb(0xCFEDFC);
 		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;
 			_startFloatDrawColumn = string.Empty;
 			_floatPaintState = 0;
-			_rightMouseHeld = false;
 		}
 
 		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)
 				{