allow InputRoll users to specify forecolor of individual cells; make marker state "x" indicator red

Author: SuuperW

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

@@ -186,7 +186,6 @@ private void DrawData(List<RollColumn> visibleColumns, int firstVisibleRow, int
 
 			int startRow = firstVisibleRow;
 			int range = Math.Min(lastVisibleRow, RowCount - 1) - startRow + 1;
-			_renderer.PrepDrawString(Font, _foreColor);
 
 			Cell currentCell = new();
 			Cell mouseCell = null;
@@ -226,28 +225,21 @@ private void DrawData(List<RollColumn> visibleColumns, int firstVisibleRow, int
 						int strOffsetY = 0;
 						QueryItemText(this, f + startRow, col, out var text, ref strOffsetX, ref strOffsetY);
 
-						bool rePrep = false;
-						Color foreColor = _foreColor;
+						Color? foreColor = QueryItemForeColor?.Invoke(this, f + startRow, col);
 						Font font = Font;
 						currentCell.Column = col;
 						currentCell.RowIndex = f + startRow;
-						if (_selectedItems.Contains(currentCell))
+						if (foreColor == null && _selectedItems.Contains(currentCell))
 						{
 							foreColor = SystemColors.HighlightText;
-							rePrep = true;
 						}
 						if (string.IsNullOrEmpty(text) && mouseCell == currentCell)
 						{
 							font = new Font(Font, FontStyle.Regular);
 							foreColor = SystemColors.GrayText;
 							text = col.Text;
-							rePrep = true;
-						}
-						if (col.Rotatable || rePrep)
-						{
-							_renderer.PrepDrawString(font, foreColor, rotate: col.Rotatable);
-							rePrep = true;
 						}
+						_renderer.PrepDrawString(font, foreColor ?? _foreColor, rotate: col.Rotatable);
 
 						int textWidth = (int)_renderer.MeasureString(text, font).Width;
 						if (col.Rotatable)
@@ -266,11 +258,6 @@ private void DrawData(List<RollColumn> visibleColumns, int firstVisibleRow, int
 
 							DrawString(text, new Rectangle(baseX + textX, baseY + textY, MaxColumnWidth, CellHeight));
 						}
-
-						if (rePrep)
-						{
-							_renderer.PrepDrawString(Font, _foreColor);
-						}
 					}
 				}
 			}
@@ -299,34 +286,23 @@ private void DrawData(List<RollColumn> visibleColumns, int firstVisibleRow, int
 
 						QueryItemText(this, f + startRow, column, out var text, ref strOffsetX, ref strOffsetY);
 
-						bool rePrep = false;
-						Color foreColor = _foreColor;
+						Color? foreColor = QueryItemForeColor?.Invoke(this, f + startRow, column);
 						Font font = Font;
 						currentCell.Column = column;
 						currentCell.RowIndex = f + startRow;
-						if (_selectedItems.Contains(currentCell))
+						if (foreColor == null && _selectedItems.Contains(currentCell))
 						{
 							foreColor = SystemColors.HighlightText;
-							rePrep = true;
 						}
 						if (string.IsNullOrEmpty(text) && mouseCell == currentCell)
 						{
 							font = new Font(Font, FontStyle.Regular);
 							foreColor = SystemColors.GrayText;
 							text = column.Text;
-							rePrep = true;
-						}
-						if (rePrep)
-						{
-							_renderer.PrepDrawString(font, foreColor);
 						}
 
+						_renderer.PrepDrawString(font, foreColor ?? _foreColor);
 						DrawString(text, new Rectangle(point.X + strOffsetX, point.Y + strOffsetY, column.Width, ColumnHeight));
-
-						if (rePrep)
-						{
-							_renderer.PrepDrawString(Font, _foreColor);
-						}
 					}
 				}
 			}

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

@@ -449,6 +449,12 @@ public int HoverInterval
 		[Category("Virtual")]
 		public event QueryItemBkColorHandler QueryItemBkColor;
 
+		/// <summary>
+		/// Fire the <see cref="QueryItemForeColor"/> event which requests the color of text for the passed cell
+		/// </summary>
+		[Category("Virtual")]
+		public event QueryItemForeColorHandler QueryItemForeColor;
+
 		[Category("Virtual")]
 		public event QueryRowBkColorHandler QueryRowBkColor;
 
@@ -531,6 +537,11 @@ public int HoverInterval
 		/// </summary>
 		public delegate void QueryItemTextHandler(InputRoll sender, int index, RollColumn column, out string text, ref int offsetX, ref int offsetY);
 
+		/// <summary>
+		/// Retrieve the foreground color for a cell. Return null to use the default.
+		/// </summary>
+		public delegate Color? QueryItemForeColorHandler(InputRoll sender, int index, RollColumn column);
+
 		/// <summary>
 		/// Retrieve the background color for a cell
 		/// </summary>

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

@@ -40,6 +40,7 @@ public MarkerControl()
 			SetupColumns();
 			MarkerView.QueryItemBkColor += MarkerView_QueryItemBkColor;
 			MarkerView.QueryItemText += MarkerView_QueryItemText;
+			MarkerView.QueryItemForeColor += MarkerView_QueryItemForeColor;
 		}
 
 		public void UpdateHotkeyTooltips(Config config)
@@ -124,6 +125,20 @@ private void MarkerView_QueryItemText(InputRoll sender, int index, RollColumn co
 			}
 		}
 
+		private Color? MarkerView_QueryItemForeColor(InputRoll sender, int index, RollColumn column)
+		{
+			if (column.Name == SAVESTATE_COL_NAME)
+			{
+				TasMovieMarker marker = Markers[index];
+				if (!marker.WantsState)
+				{
+					return Color.OrangeRed;
+				}
+			}
+
+			return null;
+		}
+
 		private void MarkerContextMenu_Opening(object sender, CancelEventArgs e)
 		{
 			EditMarkerToolStripMenuItem.Enabled =