From 33ac38fe5d3b62a988cc49bb7c211104247751ce Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sun, 22 Nov 2015 12:44:24 +0300
Subject: [PATCH] tastudio: do right-click frame move only on Alt
 right-scrolling should not fire frame drag AND greenzone invalidation (every
 time we accidentally move the mouse over the frame column)

---
 .../BizHawk.Client.EmuHawk.csproj             |  4 +-
 .../tools/TAStudio/TAStudio.ListView.cs       | 60 ++++++++++---------
 2 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index 20d4bb7b89..2fa7553fc6 100644
--- a/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -531,7 +531,9 @@
     <Compile Include="CustomControls\ViewportPanel.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="CustomControls\VirtualListView.cs" />
+    <Compile Include="CustomControls\VirtualListView.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="CustomControls\Win32.cs" />
     <Compile Include="DisplayManager\DisplayManager.cs" />
     <Compile Include="DisplayManager\DisplaySurface.cs" />
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
index b13ab5996f..f5e9d1bfd4 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs
@@ -19,8 +19,8 @@ namespace BizHawk.Client.EmuHawk
 		private float _floatPaintState;
 		private bool _patternPaint = false;
 		private bool _startCursorDrag;
-		private bool _startFrameDrag;
-		private bool _frameDragState;
+		private bool _startSelectionDrag;
+		private bool _selectionDragState;
 		private bool _supressContextMenu;
 		// SuuperW: For editing analog input
 		private string _floatEditColumn = string.Empty;
@@ -32,7 +32,7 @@ namespace BizHawk.Client.EmuHawk
 		private string[] _rightClickOverInput = null;
 		private int _rightClickFrame = -1;
 		private int _rightClickLastFrame = -1;
-		private bool _rightClickShift, _rightClickControl;
+		private bool _rightClickShift, _rightClickControl, _rightClickAlt;
 		private bool _leftButtonHeld = false;
 		private bool mouseButtonHeld
 		{
@@ -400,8 +400,8 @@ namespace BizHawk.Client.EmuHawk
 					}
 					else
 					{
-						_startFrameDrag = true;
-						_frameDragState = TasView.SelectedRows.Contains(frame);
+						_startSelectionDrag = true;
+						_selectionDragState = TasView.SelectedRows.Contains(frame);
 					}
 				}
 				else // User changed input
@@ -481,6 +481,7 @@ namespace BizHawk.Client.EmuHawk
 				{
 					_rightClickControl = (Control.ModifierKeys | Keys.Control) == Control.ModifierKeys;
 					_rightClickShift = (Control.ModifierKeys | Keys.Shift) == Control.ModifierKeys;
+					_rightClickAlt = (Control.ModifierKeys | Keys.Alt) == Control.ModifierKeys;
 					if (TasView.SelectedRows.Contains(frame))
 					{
 						_rightClickInput = new string[TasView.SelectedRows.Count()];
@@ -497,23 +498,26 @@ namespace BizHawk.Client.EmuHawk
 					}
 					_rightClickLastFrame = -1;
 
-					JumpToGreenzone();
-					// TODO: Turn off ChangeLog.IsRecording and handle the GeneralUndo here.
-					string undoStepName = "Right-Click Edit:";
-					if (_rightClickShift)
+					if (_rightClickAlt || _rightClickControl || _rightClickShift)
 					{
-						undoStepName += " Extend Input";
-						if (_rightClickControl)
-							undoStepName += ", Insert";
-					}
-					else
-					{
-						if (_rightClickControl)
-							undoStepName += " Copy";
+						JumpToGreenzone();
+						// TODO: Turn off ChangeLog.IsRecording and handle the GeneralUndo here.
+						string undoStepName = "Right-Click Edit:";
+						if (_rightClickShift)
+						{
+							undoStepName += " Extend Input";
+							if (_rightClickControl)
+								undoStepName += ", Insert";
+						}
 						else
-							undoStepName += " Move";
+						{
+							if (_rightClickControl)
+								undoStepName += " Copy";
+							else // _rightClickAlt
+								undoStepName += " Move";
+						}
+						CurrentTasMovie.ChangeLog.BeginNewBatch(undoStepName);
 					}
-					CurrentTasMovie.ChangeLog.BeginNewBatch(undoStepName);
 				}
 			}
 		}
@@ -521,7 +525,7 @@ namespace BizHawk.Client.EmuHawk
 		private void ClearLeftMouseStates()
 		{
 			_startCursorDrag = false;
-			_startFrameDrag = false;
+			_startSelectionDrag = false;
 			_startBoolDrawColumn = string.Empty;
 			_startFloatDrawColumn = string.Empty;
 			TasView.ReleaseCurrentCell();
@@ -665,21 +669,19 @@ namespace BizHawk.Client.EmuHawk
 					GoToFrame(e.NewCell.RowIndex.Value);
 				}
 			}
-			else if (_startFrameDrag)
+			else if (_startSelectionDrag)
 			{
 				if (e.OldCell.RowIndex.HasValue && e.NewCell.RowIndex.HasValue)
 				{
 					for (var i = startVal; i <= endVal; i++)
 					{
-						TasView.SelectRow(i, _frameDragState);
+						TasView.SelectRow(i, _selectionDragState);
 					}
 				}
 			}
 
 			else if (_rightClickFrame != -1)
 			{
-				_triggerAutoRestore = true;
-				_supressContextMenu = true;
 				if (frame > CurrentTasMovie.InputLogLength - _rightClickInput.Length)
 					frame = CurrentTasMovie.InputLogLength - _rightClickInput.Length;
 				if (_rightClickShift)
@@ -734,7 +736,7 @@ namespace BizHawk.Client.EmuHawk
 						for (int i = 0; i < _rightClickInput.Length; i++) // Place copied input
 							CurrentTasMovie.SetFrame(frame + i, _rightClickInput[i]);
 					}
-					else
+					else if (_rightClickAlt)
 					{
 						int shiftBy = _rightClickFrame - frame;
 						string[] shiftInput = new string[Math.Abs(shiftBy)];
@@ -752,8 +754,12 @@ namespace BizHawk.Client.EmuHawk
 						_rightClickFrame = frame;
 					}
 				}
-
-				JumpToGreenzone();
+				if (_rightClickAlt || _rightClickControl || _rightClickShift)
+				{
+					JumpToGreenzone();
+					_triggerAutoRestore = true;
+					_supressContextMenu = true;
+				}
 			}
 			// Left-click
 			else if (TasView.IsPaintDown && e.NewCell.RowIndex.HasValue && !string.IsNullOrEmpty(_startBoolDrawColumn))