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

Added helper function to convert from PixelsToRows and vice versa, helper properties for column header dimensions, ability to have different size column headers in vertical and a pre-scaled column width in horizontal orientation.

This commit is contained in:
kylelyk 2014-08-31 23:03:59 +00:00
parent 11691cd690
commit cdbb1bc13c
1 changed files with 103 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
View File

@ -23,7 +23,6 @@ namespace BizHawk.Client.EmuHawk
private readonly HScrollBar HBar; private readonly HScrollBar HBar;
private int _horizontalOrientedColumnWidth = 0;
private bool _horizontalOrientation = false; private bool _horizontalOrientation = false;
private bool _programmaticallyUpdatingScrollBarValues = false; private bool _programmaticallyUpdatingScrollBarValues = false;
@ -52,6 +51,10 @@ namespace BizHawk.Client.EmuHawk
_charSize = Gdi.MeasureString("A", this.Font); _charSize = Gdi.MeasureString("A", this.Font);
} }
UpdateCellSize();
ColumnWidth = CellWidth;
ColumnHeight = CellHeight + 5;
//TODO Figure out how to use the width and height properties of the scrollbars instead of 17 //TODO Figure out how to use the width and height properties of the scrollbars instead of 17
VBar = new VScrollBar VBar = new VScrollBar
{ {
@ -435,9 +438,8 @@ namespace BizHawk.Client.EmuHawk
{ {
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
//return (Width - _horizontalOrientedColumnWidth) / CellWidth; return (Width - ColumnWidth) / CellWidth;
} }
return (int)Math.Ceiling((Decimal)DrawHeight / CellHeight) - 1; return (int)Math.Ceiling((Decimal)DrawHeight / CellHeight) - 1;
} }
} }
@ -561,17 +563,17 @@ namespace BizHawk.Client.EmuHawk
for (int j = 0; j < _columns.Count; j++) for (int j = 0; j < _columns.Count; j++)
{ {
string text; string text;
int x = _horizontalOrientedColumnWidth + CellPadding + (CellWidth * i); int x = ColumnWidth + CellPadding + (CellWidth * i);
int y = j * CellHeight; int y = j * CellHeight;
var point = new Point(x, y); var point = new Point(x, y);
QueryItemText(i + startIndex, j, out text); QueryItemText(i + startIndex, j, out text);
if (!string.IsNullOrWhiteSpace(text)) if (!string.IsNullOrWhiteSpace(text))
{ {
Gdi.DrawString(text, point); Gdi.DrawString(text, point);
}
} }
} }
} }
}
else else
{ {
int startRow = FirstVisibleRow; int startRow = FirstVisibleRow;
@ -591,7 +593,7 @@ namespace BizHawk.Client.EmuHawk
for (int j = 0; j < _columns.Count; j++)//Horizontal for (int j = 0; j < _columns.Count; j++)//Horizontal
{ {
string text; string text;
var point = new Point(_columns[j].Left.Value + xPadding, ((i + 1) * CellHeight) + CellPadding); //i + 1 accounts for the column header var point = new Point(_columns[j].Left.Value + xPadding, RowsToPixels(i));
QueryItemText(i + startRow, j, out text); QueryItemText(i + startRow, j, out text);
if (!string.IsNullOrWhiteSpace(text)) if (!string.IsNullOrWhiteSpace(text))
{ {
@ -610,38 +612,36 @@ namespace BizHawk.Client.EmuHawk
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
Gdi.DrawRectangle(0, 0, _horizontalOrientedColumnWidth + 1, Height); Gdi.DrawRectangle(0, 0, ColumnWidth + 1, Height);
Gdi.FillRectangle(1, 1, _horizontalOrientedColumnWidth, Height - 3); Gdi.FillRectangle(1, 1, ColumnWidth, Height - 3);
int start = 0; int start = 0;
foreach (var column in _columns) foreach (var column in _columns)
{ {
start += CellHeight; start += CellHeight;
Gdi.Line(1, start, _horizontalOrientedColumnWidth, start); Gdi.Line(1, start, ColumnWidth, start);
} }
} }
else else
{ {
int bottomEdge = RowsToPixels(0);
//Gray column box and black line underneath //Gray column box and black line underneath
Gdi.FillRectangle(0, 0, Width + 1, CellHeight + 1); Gdi.FillRectangle(0, 0, Width + 1, bottomEdge + 1);
Gdi.Line(0, 0, TotalColWidth.Value + 1, 0); Gdi.Line(0, 0, TotalColWidth.Value + 1, 0);
Gdi.Line(0, CellHeight + 1, TotalColWidth.Value + 1, CellHeight + 1); Gdi.Line(0, bottomEdge, TotalColWidth.Value + 1, bottomEdge);
//Vertical black seperators //Vertical black seperators
for (int i = 0; i < _columns.Count; i++) for (int i = 0; i < _columns.Count; i++)
{ {
int pos = _columns[i].Left.Value - HBar.Value; int pos = _columns[i].Left.Value - HBar.Value;
if (pos >= 0) Gdi.Line(pos, 0, pos, bottomEdge);
{
Gdi.Line(pos, 0, pos, CellHeight + 1);
}
} }
//Draw right most line ////Draw right most line
if (_columns.Any()) if (_columns.Any())
{ {
int right = TotalColWidth.Value - HBar.Value; int right = TotalColWidth.Value - HBar.Value;
Gdi.Line(right, 0, right, CellHeight + 1); Gdi.Line(right, 0, right, bottomEdge);
} }
} }
@ -668,7 +668,7 @@ namespace BizHawk.Client.EmuHawk
Gdi.FillRectangle( Gdi.FillRectangle(
1, 1,
(i * CellHeight) + 1, (i * CellHeight) + 1,
_horizontalOrientedColumnWidth - 1, ColumnWidth - 1,
CellHeight - 1); CellHeight - 1);
} }
else//Only Left side visible else//Only Left side visible
@ -676,7 +676,7 @@ namespace BizHawk.Client.EmuHawk
Gdi.FillRectangle( Gdi.FillRectangle(
1, 1,
(i * CellHeight) + 1, (i * CellHeight) + 1,
_horizontalOrientedColumnWidth - 1, ColumnWidth - 1,
CellHeight - 1); CellHeight - 1);
} }
} }
@ -687,7 +687,7 @@ namespace BizHawk.Client.EmuHawk
Gdi.FillRectangle( Gdi.FillRectangle(
1, 1,
(i * CellHeight) + 1, (i * CellHeight) + 1,
_horizontalOrientedColumnWidth - 1, ColumnWidth - 1,
CellHeight - 1); CellHeight - 1);
} }
else//Not Visible else//Not Visible
@ -743,7 +743,7 @@ namespace BizHawk.Client.EmuHawk
// Columns // Columns
for (int i = 1; i < Width / CellWidth; i++) for (int i = 1; i < Width / CellWidth; i++)
{ {
var x = _horizontalOrientedColumnWidth + 1 + (i * CellWidth); var x = ColumnWidth + 1 + (i * CellWidth);
var y2 = (_columns.Count * CellHeight) - 1; var y2 = (_columns.Count * CellHeight) - 1;
if (y2 > Height) if (y2 > Height)
{ {
@ -756,13 +756,13 @@ namespace BizHawk.Client.EmuHawk
// Rows // Rows
for (int i = 1; i < _columns.Count + 1; i++) for (int i = 1; i < _columns.Count + 1; i++)
{ {
Gdi.Line(_horizontalOrientedColumnWidth + 1, i * CellHeight, Width - 2, i * CellHeight); Gdi.Line(ColumnWidth + 1, i * CellHeight, Width - 2, i * CellHeight);
} }
} }
else else
{ {
// Columns // Columns
int y = CellHeight + 2; int y = ColumnHeight + 1;
foreach (var column in _columns) foreach (var column in _columns)
{ {
int x = column.Left.Value - HBar.Value; int x = column.Left.Value - HBar.Value;
@ -770,13 +770,13 @@ namespace BizHawk.Client.EmuHawk
} }
if (_columns.Any()) if (_columns.Any())
{ {
Gdi.Line(TotalColWidth.Value, y, TotalColWidth.Value, Height - 1); Gdi.Line(TotalColWidth.Value - HBar.Value, y, TotalColWidth.Value - HBar.Value, Height - 1);
} }
// Rows // Rows
for (int i = 2; i < (Height / CellHeight) + 1; i++) for (int i = 1; i < VisibleRows + 1; i++)
{ {
Gdi.Line(0, (i * CellHeight) + 1, Width + 1, (i * CellHeight) + 1); Gdi.Line(0, RowsToPixels(i), Width + 1, RowsToPixels(i));
} }
} }
} }
@ -815,7 +815,7 @@ namespace BizHawk.Client.EmuHawk
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
x = (cell.RowIndex.Value * CellWidth) + 2 + _horizontalOrientedColumnWidth; x = RowsToPixels(cell.RowIndex.Value) + 2;
w = CellWidth - 1; w = CellWidth - 1;
y = (CellHeight * _columns.IndexOf(cell.Column)) + 1; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't y = (CellHeight * _columns.IndexOf(cell.Column)) + 1; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't
h = CellHeight - 1; h = CellHeight - 1;
@ -825,11 +825,11 @@ namespace BizHawk.Client.EmuHawk
w = cell.Column.Width.Value - 1; w = cell.Column.Width.Value - 1;
x = cell.Column.Left.Value - HBar.Value + 1; x = cell.Column.Left.Value - HBar.Value + 1;
y = (CellHeight * (cell.RowIndex.Value + 1)) + 2; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't y = RowsToPixels(cell.RowIndex.Value) + 1; // We can't draw without row and column, so assume they exist and fail catastrophically if they don't
h = CellHeight - 1; h = CellHeight - 1;
} }
if (x > DrawWidth || y > DrawHeight) { return; }//Don't d if (x > DrawWidth || y > DrawHeight) { return; }//Don't draw if off screen.
Gdi.SetBrush(color); Gdi.SetBrush(color);
Gdi.FillRectangle(x, y, w, h); Gdi.FillRectangle(x, y, w, h);
@ -1014,7 +1014,7 @@ namespace BizHawk.Client.EmuHawk
} }
private void IncrementScrollBar(ScrollBar bar, bool increment) private void IncrementScrollBar(ScrollBar bar, bool increment)
{ {
int newVal; int newVal;
if (increment) if (increment)
{ {
@ -1022,13 +1022,13 @@ namespace BizHawk.Client.EmuHawk
if (newVal > bar.Maximum) if (newVal > bar.Maximum)
{ {
newVal = bar.Maximum; newVal = bar.Maximum;
}
} }
}
else else
{ {
newVal = bar.Value - bar.SmallChange; newVal = bar.Value - bar.SmallChange;
if (newVal < 0) if (newVal < 0)
{ {
newVal = 0; newVal = 0;
} }
} }
@ -1131,6 +1131,10 @@ namespace BizHawk.Client.EmuHawk
private void ColumnChangedCallback() private void ColumnChangedCallback()
{ {
RecalculateScrollBars(); RecalculateScrollBars();
if (_columns.Any())
{
ColumnWidth = _columns.Max(c => c.Width.Value) + CellPadding * 4;
}
} }
#endregion #endregion
@ -1146,7 +1150,7 @@ namespace BizHawk.Client.EmuHawk
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
NeedsVScrollbar = _columns.Count > DrawHeight / CellHeight; NeedsVScrollbar = _columns.Count > DrawHeight / CellHeight;
NeedsHScrollbar = RowCount > (DrawWidth - _horizontalOrientedColumnWidth) / CellWidth; NeedsHScrollbar = RowCount > (DrawWidth - ColumnWidth) / CellWidth;
} }
else else
{ {
@ -1164,7 +1168,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
VBar.Maximum = ((RowCount + 1) * CellHeight) - DrawHeight + VBar.LargeChange - 1; VBar.Maximum = RowsToPixels(RowCount + 1) - DrawHeight + VBar.LargeChange - 1;
} }
VBar.Size = new Size(VBar.Width, Height); VBar.Size = new Size(VBar.Width, Height);
@ -1183,7 +1187,7 @@ namespace BizHawk.Client.EmuHawk
HBar.Visible = true; HBar.Visible = true;
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
HBar.Maximum = ((RowCount * _horizontalOrientedColumnWidth)) / CellWidth + HBar.LargeChange - 1;//TODO test this HBar.Maximum = ((RowCount * ColumnWidth)) / CellWidth + HBar.LargeChange - 1;//TODO test this
} }
else else
{ {
@ -1324,13 +1328,13 @@ namespace BizHawk.Client.EmuHawk
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
//TODO: Test this branch //TODO: Test this branch
if (x < _horizontalOrientedColumnWidth) if (x < ColumnWidth)
{ {
newCell.RowIndex = null; newCell.RowIndex = null;
} }
else else
{ {
newCell.RowIndex = (x - _horizontalOrientedColumnWidth) / CellWidth; newCell.RowIndex = PixelsToRows(x);
} }
int colIndex = (y / CellHeight); int colIndex = (y / CellHeight);
@ -1348,7 +1352,7 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
newCell.RowIndex = (y + VBar.Value) / CellHeight - 1; newCell.RowIndex = PixelsToRows(x);
} }
newCell.Column = ColumnAtX(x); newCell.Column = ColumnAtX(x);
@ -1365,13 +1369,13 @@ namespace BizHawk.Client.EmuHawk
{ {
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
var x = _horizontalOrientedColumnWidth; var x = ColumnWidth;
var y = 0; var y = 0;
return new Point(x, y); return new Point(x, y);
} }
else else
{ {
var y = CellHeight; var y = ColumnHeight;
return new Point(0, y); return new Point(0, y);
} }
} }
@ -1387,30 +1391,6 @@ namespace BizHawk.Client.EmuHawk
gdi.Line(x, y + height, x, y); gdi.Line(x, y + height, x, y);
} }
// TODO: calculate this on Cell Padding change instead of calculate it every time
/// <summary>
/// The height of a cell. Only can be changed by changing the Font or CellPadding.
/// </summary>
private int CellHeight
{
get
{
return _charSize.Height + (CellPadding * 2);
}
}
// TODO: calculate this on Cell Padding change instead of calculate it every time
/// <summary>
/// The width of a cell. Only can be changed by changing the Font or CellPadding.
/// </summary>
private int CellWidth
{
get
{
return _charSize.Width + (CellPadding * 4); // Double the padding for horizontal because it looks better
}
}
/// <summary> /// <summary>
/// A boolean that indicates if the InputRoll is too large vertically and requires a vertical scrollbar. /// A boolean that indicates if the InputRoll is too large vertically and requires a vertical scrollbar.
/// </summary> /// </summary>
@ -1425,7 +1405,7 @@ namespace BizHawk.Client.EmuHawk
//private void ColumnChanged() //private void ColumnChanged()
//{ //{
// var text = _columns.Max(c => c.Text.Length); // var text = _columns.Max(c => c.Text.Length);
// _horizontalOrientedColumnWidth = (text * _charSize.Width) + (CellPadding * 2); // ColumnWidth = (text * _charSize.Width) + (CellPadding * 2);
//} //}
/// <summary> /// <summary>
@ -1473,10 +1453,63 @@ namespace BizHawk.Client.EmuHawk
return null; return null;
} }
//private int RowsToPixels(int index, int rowDimension) /// <summary>
//{ /// Converts a row number to a horizontal or vertical coordinate.
// return index * rowDimension; /// </summary>
//} /// <param name="pixels">A row number.</param>
/// <returns>A vertical coordinate if Vertical Oriented, otherwise a horizontal coordinate.</returns>
private int RowsToPixels(int index)
{
if (_horizontalOrientation)
{
return index * CellWidth + ColumnWidth;
}
return index * CellHeight + ColumnHeight;
}
/// <summary>
/// Converts a horizontal or vertical coordinate to a row number.
/// </summary>
/// <param name="pixels">A vertical coordinate if Vertical Oriented, otherwise a horizontal coordinate.</param>
/// <returns>A row number between 0 and VisibleRows if it is a Datarow, otherwise a negative number if above all Datarows.</returns>
private int PixelsToRows(int pixels)
{
if (_horizontalOrientation)
{
return (pixels - ColumnWidth) / CellWidth;
}
return (pixels - ColumnHeight) / CellHeight;
}
/// <summary>
/// The width of the largest column cell in Horizontal Orientation
/// </summary>
private int ColumnWidth { get; set; }
/// <summary>
/// The height of a column cell in Vertical Orientation.
/// </summary>
private int ColumnHeight { get; set; }
//Cell defaults
/// <summary>
/// The width of a cell in Horizontal Orientation. Only can be changed by changing the Font or CellPadding.
/// </summary>
private int CellWidth { get; set; }
/// <summary>
/// The height of a cell in Vertical Orientation. Only can be changed by changing the Font or CellPadding.
/// </summary>
private int CellHeight { get; set; }
/// <summary>
/// Call when _charSize or CellPadding is changed.
/// </summary>
private void UpdateCellSize()
{
CellHeight = _charSize.Height + CellPadding * 2;
CellWidth = _charSize.Width + CellPadding * 4; // Double the padding for horizontal because it looks better
}
#endregion #endregion