ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InputRoll - simplify

This commit is contained in:
adelikat 2019-12-03 13:01:52 -06:00
parent bf1d64e5d5
commit f0c745d0f7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
View File

@ -42,14 +42,12 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void DrawString(string text, int width, int x, int y) private void DrawString(string text, Rectangle rect)
{ {
if (string.IsNullOrWhiteSpace(text)) if (!string.IsNullOrWhiteSpace(text))
{ {
return; _renderer.DrawString(text, rect);
} }
_renderer.DrawString(text, new Rectangle(x, y, width - CellWidthPadding, CellHeight));
} }
protected override void OnPaintBackground(PaintEventArgs e) protected override void OnPaintBackground(PaintEventArgs e)
@ -173,12 +171,12 @@ namespace BizHawk.Client.EmuHawk
if (IsHoveringOnColumnCell && column == CurrentCell.Column) if (IsHoveringOnColumnCell && column == CurrentCell.Column)
{ {
_renderer.PrepDrawString(Font, SystemColors.HighlightText); _renderer.PrepDrawString(Font, SystemColors.HighlightText);
DrawString(column.Text, column.Width, strX, strY); DrawString(column.Text, new Rectangle(strX, strY, column.Width, CellHeight));
_renderer.PrepDrawString(Font, _foreColor); _renderer.PrepDrawString(Font, _foreColor);
} }
else else
{ {
DrawString(column.Text, column.Width, strX, strY); DrawString(column.Text, new Rectangle(strX, strY, column.Width, CellHeight));
} }
y += columnHeight; y += columnHeight;
@ -197,12 +195,12 @@ namespace BizHawk.Client.EmuHawk
if (IsHoveringOnColumnCell && column == CurrentCell.Column) if (IsHoveringOnColumnCell && column == CurrentCell.Column)
{ {
_renderer.PrepDrawString(Font, SystemColors.HighlightText); _renderer.PrepDrawString(Font, SystemColors.HighlightText);
DrawString(column.Text, column.Width, x, y); DrawString(column.Text, new Rectangle(x, y, column.Width, ColumnHeight));
_renderer.PrepDrawString(Font, _foreColor); _renderer.PrepDrawString(Font, _foreColor);
} }
else else
{ {
DrawString(column.Text, column.Width, x, y); DrawString(column.Text, new Rectangle(x, y, column.Width, ColumnHeight));
} }
} }
} }
@ -265,7 +263,7 @@ namespace BizHawk.Client.EmuHawk
int textY = CellWidthPadding + strOffsetY; int textY = CellWidthPadding + strOffsetY;
_renderer.PrepDrawString(Font, _foreColor, rotate: true); _renderer.PrepDrawString(Font, _foreColor, rotate: true);
DrawString(text, 999, baseX - textY, baseY + textX); // TODO: calculate width DrawString(text, new Rectangle(baseX - textY, baseY + textX, 999, CellHeight));
_renderer.PrepDrawString(Font, _foreColor, rotate: false); _renderer.PrepDrawString(Font, _foreColor, rotate: false);
} }
else else
@ -274,7 +272,7 @@ namespace BizHawk.Client.EmuHawk
int textX = Math.Max(((CellWidth - textWidth) / 2), CellWidthPadding) + strOffsetX; int textX = Math.Max(((CellWidth - textWidth) / 2), CellWidthPadding) + strOffsetX;
int textY = CellHeightPadding + strOffsetY; int textY = CellHeightPadding + strOffsetY;
DrawString(text, ColumnWidth, baseX + textX, baseY + textY); DrawString(text, new Rectangle(baseX + textX, baseY + textY, ColumnWidth, CellHeight));
} }
} }
} }
@ -318,7 +316,7 @@ namespace BizHawk.Client.EmuHawk
rePrep = true; rePrep = true;
} }
DrawString(text, col.Width, point.X + strOffsetX, point.Y + strOffsetY); DrawString(text, new Rectangle(point.X + strOffsetX, point.Y + strOffsetY, col.Width, ColumnHeight));
if (rePrep) if (rePrep)
{ {