From 7f053fc0079dfb9961cf33df19344bfee41d4f9e Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 10 Aug 2014 21:35:17 +0000 Subject: [PATCH] Input Roll - simpler and more efficient code, with a decent speedup --- .../CustomControls/GDITextRenderer.cs | 4 ++-- .../tools/TAStudio/InputRoll.cs | 18 ++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CustomControls/GDITextRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/GDITextRenderer.cs index 84db6dc997..d64efd94f7 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/GDITextRenderer.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/GDITextRenderer.cs @@ -121,12 +121,12 @@ namespace BizHawk.Client.EmuHawk.CustomControls /// the font to use to draw the string /// the text color to set /// the location to start string draw (top-left) - public void DrawString(String str, Font font, Point point) + public void DrawString(String str, Point point) { TextOut(_hdc, point.X, point.Y, str, str.Length); } - public void PrepDrawString(String str, Font font, Color color, Point point) + public void PrepDrawString(Font font, Color color) { SetFont(font); SetTextColor(color); diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs index 0f9c37fe8d..fe32b94920 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs @@ -166,7 +166,6 @@ namespace BizHawk.Client.EmuHawk { var colWidth = _horizontalOrientedColumnWidth; gdi.DrawRectangle(0, 0, colWidth, Height); - gdi.FillRectangle(1, 1, colWidth - 3, Height - 3); int start = 0; foreach (var column in Columns) @@ -243,22 +242,22 @@ namespace BizHawk.Client.EmuHawk if (HorizontalOrientation) { int start = 0; + gdi.PrepDrawString(this.Font, this.ForeColor); foreach (var column in Columns) { var point = new Point(CellPadding, start + CellPadding); - gdi.PrepDrawString(column.Text, this.Font, this.ForeColor, point); - gdi.DrawString(column.Text, this.Font, point); + gdi.DrawString(column.Text, point); start += CellHeight; } } else { int start = CellPadding; + gdi.PrepDrawString(this.Font, this.ForeColor); foreach(var column in Columns) { var point = new Point(start + CellPadding, CellPadding); - gdi.PrepDrawString(column.Text, this.Font, this.ForeColor, point); - gdi.DrawString(column.Text, this.Font, point); + gdi.DrawString(column.Text, point); start += CalcWidth(column); } } @@ -271,6 +270,7 @@ namespace BizHawk.Client.EmuHawk if (HorizontalOrientation) { var visibleRows = (Width - _horizontalOrientedColumnWidth) / CellWidth; + gdi.PrepDrawString(this.Font, this.ForeColor); for (int i = 0; i < visibleRows; i++) { for (int j = 0; j < Columns.Count; j++) @@ -280,14 +280,14 @@ namespace BizHawk.Client.EmuHawk int y = j * CellHeight; var point = new Point(x, y); QueryItemText(i, j, out text); - gdi.PrepDrawString(text, this.Font, this.ForeColor, point); - gdi.DrawString(text, this.Font, point); + gdi.DrawString(text, point); } } } else { var visibleRows = (Height / CellHeight) - 1; + gdi.PrepDrawString(this.Font, this.ForeColor); for (int i = 1; i < visibleRows; i++) { int x = 1; @@ -296,9 +296,7 @@ namespace BizHawk.Client.EmuHawk string text; var point = new Point(x + CellPadding, i * CellHeight); QueryItemText(i, j, out text); - - gdi.PrepDrawString(text, this.Font, this.ForeColor, point); - gdi.DrawString(text, this.Font, point); + gdi.DrawString(text, point); x += CalcWidth(Columns[j]); } }