simplify how InputRoll updates pointed cell; make column text on hover update while following cursor

Author: SuuperW

src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs

@@ -759,8 +759,6 @@ public int FirstVisibleRow
 						_programmaticallyUpdatingScrollBarValues = false;
 					}
 				}
-				_programmaticallyChangingRow = false;
-				PointMouseToNewCell();
 			}
 		}
 
@@ -833,8 +831,6 @@ private int LastVisibleRow
 					}
 					while ((lastVisible - value < 0 || _lagFrames[VisibleRows - halfRow] < lastVisible - value) && FirstVisibleRow != 0);
 				}
-				_programmaticallyChangingRow = false;
-				PointMouseToNewCell();
 			}
 		}
 
@@ -945,21 +941,15 @@ public void ScrollToIndex(int index)
 					}
 				}
 			}
-			_programmaticallyChangingRow = false;
-			PointMouseToNewCell();
 		}
 
-		public bool _programmaticallyChangingRow = false;
-
 		/// <summary>
 		/// Scrolls so that the given index is visible, if it isn't already; doesn't use scroll settings.
 		/// </summary>
 		public void MakeIndexVisible(int index)
 		{
 			if (!IsVisible(index))
 			{
-				_programmaticallyChangingRow = true;
-
 				if (FirstVisibleRow > index)
 				{
 					FirstVisibleRow = index;
@@ -1017,32 +1007,16 @@ public IEnumerable<ToolStripItem> GenerateContextMenuItems()
 		private bool _columnDownMoved;
 		private int _previousX; // TODO: move me
 
-		// It's necessary to call this anytime the control is programmatically scrolled
-		// Since the mouse may not be pointing to the same cell anymore
-		public void PointMouseToNewCell()
+		public bool SuppressCellChange;
+
+		private void PointMouseToNewCell()
 		{
+			if (SuppressCellChange) return;
+
 			if (_currentX.HasValue && _currentY.HasValue)
 			{
 				var newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
-				if (CurrentCell != newCell)
-				{
-					if (QueryFrameLag != null && newCell.RowIndex.HasValue)
-					{
-						newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
-					}
-
-					newCell.RowIndex += FirstVisibleRow;
-					if (newCell.RowIndex < 0)
-					{
-						newCell.RowIndex = 0;
-					}
-
-					if (_programmaticallyChangingRow)
-					{
-						_programmaticallyChangingRow = false;
-						CellChanged(newCell);
-					}
-				}
+				CellChanged(newCell);
 			}
 		}
 
@@ -1073,18 +1047,6 @@ protected override void OnMouseMove(MouseEventArgs e)
 
 			Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value);
 
-			// SuuperW: Hide lag frames
-			if (QueryFrameLag != null && newCell.RowIndex.HasValue)
-			{
-				newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
-			}
-
-			newCell.RowIndex += FirstVisibleRow;
-			if (newCell.RowIndex < 0)
-			{
-				newCell.RowIndex = 0;
-			}
-
 			if (!newCell.Equals(CurrentCell))
 			{
 				CellChanged(newCell);
@@ -1654,6 +1616,7 @@ private void VerticalBar_ValueChanged(object sender, EventArgs e)
 				Refresh();
 			}
 
+			PointMouseToNewCell();
 			if (_horizontalOrientation)
 			{
 				ColumnScroll?.Invoke(this, e);
@@ -1671,6 +1634,7 @@ private void HorizontalBar_ValueChanged(object sender, EventArgs e)
 				Refresh();
 			}
 
+			PointMouseToNewCell();
 			if (_horizontalOrientation)
 			{
 				RowScroll?.Invoke(this, e);
@@ -1930,6 +1894,18 @@ private Cell CalculatePointedCell(int x, int y)
 			if (!(IsPaintDown || rightButton) && newCell.RowIndex <= -1) // -2 if we're entering from the top
 			{
 				newCell.RowIndex = null;
+				return newCell;
+			}
+
+			if (QueryFrameLag != null)
+			{
+				newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value);
+			}
+
+			newCell.RowIndex += FirstVisibleRow;
+			if (newCell.RowIndex < 0)
+			{
+				newCell.RowIndex = 0;
 			}
 
 			return newCell;

src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs

@@ -767,10 +767,6 @@ private void TasView_MouseDown(object sender, MouseEventArgs e)
 				UpdateActiveMovieInputs();
 			}
 
-			// only on mouse button down, check that the pointed to cell is the correct one (can be wrong due to scroll while playing)
-			roll._programmaticallyChangingRow = true;
-			roll.PointMouseToNewCell();
-
 			if (e.Button == MouseButtons.Middle)
 			{
 				if (MainForm.EmulatorPaused)
@@ -1346,7 +1342,9 @@ private void TasView_PointedCellChanged(object sender, InputRoll.CellEventArgs e
 
 			if (MouseButtonHeld)
 			{
-				roll.MakeIndexVisible(roll.CurrentCell.RowIndex.Value); // todo: limit scrolling speed
+				roll.SuppressCellChange = true; // avoid inifinite recursion of scrolling cuasing PointedCellChanged
+				roll.MakeIndexVisible(roll.CurrentCell.RowIndex.Value);
+				roll.SuppressCellChange = false;
 				SetTasViewRowCount(); // refreshes
 			}
 		}