From 06dd71f8497027ed63014f09cd0d2dee4bedeb22 Mon Sep 17 00:00:00 2001 From: adelikat Date: Mon, 13 Oct 2014 19:30:59 +0000 Subject: [PATCH] Input Roll - change remaining callback methods to pass the RollColumn object instead of index --- .../tools/TAStudio/InputRoll.cs | 24 +++++++++---------- .../tools/TAStudio/MarkerControl.cs | 6 ++--- .../tools/TAStudio/TAStudio.ListView.cs | 8 +++---- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs index 6c20a43772..f699428c91 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs @@ -275,17 +275,15 @@ namespace BizHawk.Client.EmuHawk /// public delegate void QueryItemTextHandler(int index, RollColumn column, out string text); - // TODO: change this to pass in a column object instead of an index (which forces the caller to look up the column /// /// Retrieve the background color for a cell /// - public delegate void QueryItemBkColorHandler(int index, int column, ref Color color); + public delegate void QueryItemBkColorHandler(int index, RollColumn column, ref Color color); - // TODO: change this to pass in a column object instead of an index (which forces the caller to look up the column /// /// Retrive the image for a given cell /// - public delegate void QueryItemIconHandler(int index, int column, ref Bitmap icon); + public delegate void QueryItemIconHandler(int index, RollColumn column, ref Bitmap icon); public delegate void CellChangeEventHandler(object sender, CellEventArgs e); @@ -620,7 +618,7 @@ namespace BizHawk.Client.EmuHawk string text; QueryItemText(i + startIndex, columns[j], out text); - //Center Text + // Center Text int x = RowsToPixels(i) + (CellWidth - text.Length * _charSize.Width) / 2; int y = (j * CellHeight) + CellHeightPadding; var point = new Point(x, y); @@ -638,9 +636,9 @@ namespace BizHawk.Client.EmuHawk Gdi.PrepDrawString(this.Font, this.ForeColor); int xPadding = CellWidthPadding + 1 - HBar.Value; - for (int i = 0; i < range; i++)//Vertical + for (int i = 0; i < range; i++) // Vertical { - for (int j = 0; j < columns.Count; j++)//Horizontal + for (int j = 0; j < columns.Count; j++) // Horizontal { var col = columns[j]; if (col.Left.Value < 0 || col.Right.Value > DrawWidth) @@ -653,7 +651,7 @@ namespace BizHawk.Client.EmuHawk Bitmap image = null; if (QueryItemIcon != null) { - QueryItemIcon(i + startRow, j, ref image); + QueryItemIcon(i + startRow, columns[j], ref image); } if (image != null) @@ -930,10 +928,10 @@ namespace BizHawk.Client.EmuHawk for (int i = 0; i < range; i++) { - for (int j = 0; j < columns.Count; j++)//TODO: Don't query all columns + for (int j = 0; j < columns.Count; j++) // TODO: Don't query all columns { Color color = Color.White; - QueryItemBkColor(i + startIndex, j, ref color); + QueryItemBkColor(i + startIndex, columns[j], ref color); if (color != Color.White) // An easy optimization, don't draw unless the user specified something other than the default { @@ -952,12 +950,12 @@ namespace BizHawk.Client.EmuHawk int startRow = FirstVisibleRow; int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1; - for (int i = 0; i < range; i++)//Vertical + for (int i = 0; i < range; i++) // Vertical { - for (int j = 0; j < columns.Count; j++)//Horizontal + for (int j = 0; j < columns.Count; j++) // Horizontal { Color color = Color.White; - QueryItemBkColor(i + startRow, j, ref color); + QueryItemBkColor(i + startRow, columns[j], ref color); if (color != Color.White) // An easy optimization, don't draw unless the user specified something other than the default { var cell = new Cell diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index bbe9c9a303..e1de34462d 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk } - private void MarkerView_QueryItemBkColor(int index, int column, ref Color color) + private void MarkerView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color) { var prev = Tastudio.CurrentMovie.Markers.PreviousOrCurrent(Global.Emulator.Frame); @@ -59,11 +59,11 @@ namespace BizHawk.Client.EmuHawk { if (record.Lagged.Value) { - color = column == 0 ? TAStudio.LagZone_FrameCol : TAStudio.LagZone_InputLog; + color = column.Name == "FrameColumn" ? TAStudio.LagZone_FrameCol : TAStudio.LagZone_InputLog; } else { - color = column == 0 ? TAStudio.GreenZone_FrameCol : TAStudio.GreenZone_InputLog; + color = column.Name == "LabelColumn" ? TAStudio.GreenZone_FrameCol : TAStudio.GreenZone_InputLog; } } else diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index e3a4d26cfe..149eb1cb0a 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -35,9 +35,9 @@ namespace BizHawk.Client.EmuHawk #region Query callbacks - private void TasView_QueryItemIcon(int index, int column, ref Bitmap bitmap) + private void TasView_QueryItemIcon(int index, InputRoll.RollColumn column, ref Bitmap bitmap) { - var columnName = TasView.VisibleColumns.ToList()[column].Name; // TODO: don't do this when a column object is passed in instead of an int + var columnName = column.Name; if (columnName == MarkerColumnName) { @@ -77,9 +77,9 @@ namespace BizHawk.Client.EmuHawk } } - private void TasView_QueryItemBkColor(int index, int column, ref Color color) + private void TasView_QueryItemBkColor(int index, InputRoll.RollColumn column, ref Color color) { - var columnName = TasView.VisibleColumns.ToList()[column].Name; // TODO: don't do this when a column object is passed in instead of an int + var columnName = column.Name; var record = _currentTasMovie[index]; if (columnName == MarkerColumnName)