From 15ba976416eb0c3589ac475e527d0486e0fe370b Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Fri, 29 Aug 2014 17:42:07 +0000
Subject: [PATCH] Input Roll - move selection logic from Mouse click to Mouse
 down

---
 .../tools/TAStudio/InputRoll.cs               | 76 +++++++++----------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
index 83f5a30f20..a5c8ed344c 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
@@ -852,45 +852,6 @@ namespace BizHawk.Client.EmuHawk
 			base.OnMouseLeave(e);
 		}
 
-		protected override void OnMouseClick(MouseEventArgs e)
-		{
-			if (IsHoveringOnColumnCell)
-			{
-				ColumnClickEvent(ColumnAtX(e.X));
-			}
-			else if (IsHoveringOnDataCell)
-			{
-				if (ModifierKeys == Keys.Alt)
-				{
-					MessageBox.Show("Alt click logic is not yet implemented");
-				}
-				else if (ModifierKeys == Keys.Shift)
-				{
-					if (SelectedItems.Any())
-					{
-						MessageBox.Show("Shift click logic is not yet implemented");
-					}
-					else
-					{
-						SelectCell(CurrentCell);
-					}
-				}
-				else if (ModifierKeys == Keys.Control)
-				{
-					SelectCell(CurrentCell);
-				}
-				else
-				{
-					SelectedItems.Clear();
-					SelectCell(CurrentCell);
-				}
-
-				Refresh();
-			}
-
-			base.OnMouseClick(e);
-		}
-
 		protected override void OnMouseDown(MouseEventArgs e)
 		{
 			if (e.Button == MouseButtons.Left && InputPaintingMode)
@@ -903,6 +864,43 @@ namespace BizHawk.Client.EmuHawk
 				RightButtonHeld = true;
 			}
 
+			if (e.Button == MouseButtons.Left)
+			{
+				if (IsHoveringOnColumnCell)
+				{
+					ColumnClickEvent(ColumnAtX(e.X));
+				}
+				else if (IsHoveringOnDataCell)
+				{
+					if (ModifierKeys == Keys.Alt)
+					{
+						MessageBox.Show("Alt click logic is not yet implemented");
+					}
+					else if (ModifierKeys == Keys.Shift)
+					{
+						if (SelectedItems.Any())
+						{
+							MessageBox.Show("Shift click logic is not yet implemented");
+						}
+						else
+						{
+							SelectCell(CurrentCell);
+						}
+					}
+					else if (ModifierKeys == Keys.Control)
+					{
+						SelectCell(CurrentCell);
+					}
+					else
+					{
+						SelectedItems.Clear();
+						SelectCell(CurrentCell);
+					}
+
+					Refresh();
+				}
+			}
+
 			base.OnMouseDown(e);
 		}