diff --git a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs index 599f96ace6..2d158351a9 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/ControlRenderer/GdiPlusRenderer.cs @@ -10,13 +10,12 @@ namespace BizHawk.Client.EmuHawk.CustomControls private readonly Pen _currentPen = new Pen(Color.Black); private readonly SolidBrush _currentBrush = new SolidBrush(Color.Black); private readonly SolidBrush _currentStringBrush = new SolidBrush(Color.Black); - private readonly Font _defaultFont = new Font("Arial", 8, FontStyle.Bold); private Font _currentFont; private bool _rotateString; - public GdiPlusRenderer() + public GdiPlusRenderer(Font font) { - _currentFont = _defaultFont; + _currentFont = font; } private class GdiPlusGraphicsLock : IDisposable @@ -34,7 +33,6 @@ namespace BizHawk.Client.EmuHawk.CustomControls _currentPen.Dispose(); _currentBrush.Dispose(); _currentStringBrush.Dispose(); - _defaultFont.Dispose(); } public void DrawBitmap(Bitmap bitmap, Point point) diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs index 5fe9548407..792e289e5a 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs @@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk int strOffsetX = 0; int strOffsetY = 0; QueryItemText(startRow, col, out text, ref strOffsetX, ref strOffsetY); - int textWidth = _renderer.MeasureString(text, _font).Width; + int textWidth = _renderer.MeasureString(text, Font).Width; height = Math.Max(height, textWidth + (CellWidthPadding * 2)); } _horizontalColumnHeights[j] = height; @@ -122,13 +122,13 @@ namespace BizHawk.Client.EmuHawk int textOffsetY = CellHeightPadding; if (HorizontalOrientation) { - int textHeight = _renderer.MeasureString(_columnDown.Text, _font).Height; + int textHeight = _renderer.MeasureString(_columnDown.Text, Font).Height; textOffsetY = (columnHeight - textHeight) / 2; } _renderer.SetSolidPen(_backColor); _renderer.DrawRectangle(x1, y1, x2, y2); - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); _renderer.DrawString(_columnDown.Text, new Point(x1 + CellWidthPadding, y1 + textOffsetY)); } } @@ -159,7 +159,7 @@ namespace BizHawk.Client.EmuHawk _renderer.SetBrush(bgColor); _renderer.FillRectangle(x1, y1, x2 - x1, y2 - y1); - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); _renderer.DrawString(text, new Point(x1 + CellWidthPadding + offsetX, y1 + CellHeightPadding + offsetY)); } } @@ -170,20 +170,20 @@ namespace BizHawk.Client.EmuHawk { int y = -_vBar.Value; - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); for(int j = 0; j < visibleColumns.Count; j++) { var column = visibleColumns[j]; var columnHeight = GetHColHeight(j); - var textHeight = _renderer.MeasureString(column.Text, _font).Height; + var textHeight = _renderer.MeasureString(column.Text, Font).Height; var point = new Point(CellWidthPadding, y + ((columnHeight - textHeight) / 2)); if (IsHoveringOnColumnCell && column == CurrentCell.Column) { - _renderer.PrepDrawString(_font, SystemColors.HighlightText); + _renderer.PrepDrawString(Font, SystemColors.HighlightText); DrawString(column.Text, column.Width, point); - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); } else { @@ -195,7 +195,7 @@ namespace BizHawk.Client.EmuHawk } else { - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); foreach (var column in visibleColumns) { @@ -203,9 +203,9 @@ namespace BizHawk.Client.EmuHawk if (IsHoveringOnColumnCell && column == CurrentCell.Column) { - _renderer.PrepDrawString(_font, SystemColors.HighlightText); + _renderer.PrepDrawString(Font, SystemColors.HighlightText); DrawString(column.Text, column.Width, point); - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); } else { @@ -230,7 +230,7 @@ namespace BizHawk.Client.EmuHawk int startRow = FirstVisibleRow; int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1; - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); int lastVisible = LastVisibleColumnIndex; for (int j = FirstVisibleColumn; j <= lastVisible; j++) { @@ -265,7 +265,7 @@ namespace BizHawk.Client.EmuHawk int strOffsetY = 0; QueryItemText(f + startRow, col, out text, ref strOffsetX, ref strOffsetY); - int textWidth = _renderer.MeasureString(text, _font).Width; + int textWidth = _renderer.MeasureString(text, Font).Width; if (col.Rotatable) { // Center Text @@ -273,9 +273,9 @@ namespace BizHawk.Client.EmuHawk int textY = CellWidthPadding + strOffsetY; var point = new Point(baseX - textY, baseY + textX); - _renderer.PrepDrawString(_font, _foreColor, rotate: true); + _renderer.PrepDrawString(Font, _foreColor, rotate: true); DrawString(text, null, point); - _renderer.PrepDrawString(_font, _foreColor, rotate: false); + _renderer.PrepDrawString(Font, _foreColor, rotate: false); } else { @@ -294,7 +294,7 @@ namespace BizHawk.Client.EmuHawk int startRow = FirstVisibleRow; int range = Math.Min(LastVisibleRow, RowCount - 1) - startRow + 1; - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); int xPadding = CellWidthPadding + 1 - _hBar.Value; for (int i = 0, f = 0; f < range; i++, f++) // Vertical { @@ -325,7 +325,7 @@ namespace BizHawk.Client.EmuHawk bool rePrep = false; if (_selectedItems.Contains(new Cell { Column = visibleColumns[j], RowIndex = f + startRow })) { - _renderer.PrepDrawString(_font, SystemColors.HighlightText); + _renderer.PrepDrawString(Font, SystemColors.HighlightText); rePrep = true; } @@ -333,7 +333,7 @@ namespace BizHawk.Client.EmuHawk if (rePrep) { - _renderer.PrepDrawString(_font, _foreColor); + _renderer.PrepDrawString(Font, _foreColor); } } } diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index 00e22c987a..661af9bbda 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -65,8 +65,6 @@ namespace BizHawk.Client.EmuHawk [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] public bool SuspendHotkeys { get; set; } - private readonly Font _font = new Font("Arial", 8, FontStyle.Bold); - public InputRoll() { UseCustomBackground = true; @@ -82,14 +80,14 @@ namespace BizHawk.Client.EmuHawk SetStyle(ControlStyles.Opaque, true); SetStyle(ControlStyles.OptimizedDoubleBuffer, true); - _renderer = new GdiPlusRenderer(); + _renderer = new GdiPlusRenderer(Font); using (var g = CreateGraphics()) using (_renderer.LockGraphics(g, Width, Height)) { // Measure width change to ignore extra padding at start/end - var size1 = _renderer.MeasureString("A", _font); - var size2 = _renderer.MeasureString("AA", _font); + var size1 = _renderer.MeasureString("A", Font); + var size2 = _renderer.MeasureString("AA", Font); _charSize = new Size(size2.Width - size1.Width, size1.Height); // TODO make this a property so changing it updates other values. } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs index fc20dcb1fb..d2edb39a15 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Designer.cs @@ -1236,7 +1236,7 @@ namespace BizHawk.Client.EmuHawk | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.TasView.CellHeightPadding = 0; - this.TasView.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.TasView.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.TasView.FullRowSelect = true; this.TasView.HideWasLagFrames = false; this.TasView.HorizontalOrientation = false;