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

InputRoll - fixes

This commit is contained in:
adelikat 2019-12-06 22:23:23 -06:00
parent 0e03696b93
commit 6a775ec346
2 changed files with 26 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,8 @@ namespace BizHawk.Client.EmuHawk
SetLagFramesArray(); SetLagFramesArray();
var visibleColumns = _columns.VisibleColumns var visibleColumns = _columns.VisibleColumns
.Where(c => c.Left < e.ClipRectangle.Width) .Where(c => c.Right > _hBar.Value)
.Where(c => c.Left - _hBar.Value < e.ClipRectangle.Width)
.ToList(); .ToList();
// TODO: FirstVisibleRow assumes there is a visible row // TODO: FirstVisibleRow assumes there is a visible row
@ -38,10 +39,10 @@ namespace BizHawk.Client.EmuHawk
} }
// Background // Background
DrawBg(visibleColumns, e.ClipRectangle); DrawBg(visibleColumns, e.ClipRectangle, firstVisibleRow, lastVisibleRow);
// Foreground // Foreground
DrawData(visibleColumns, e.ClipRectangle, firstVisibleRow, lastVisibleRow); DrawData(visibleColumns, firstVisibleRow, lastVisibleRow);
DrawColumnDrag(visibleColumns); DrawColumnDrag(visibleColumns);
DrawCellDrag(visibleColumns); DrawCellDrag(visibleColumns);
@ -208,18 +209,14 @@ namespace BizHawk.Client.EmuHawk
} }
} }
private void DrawData(List<RollColumn> visibleColumns, Rectangle rect, int firstVisibleRow, int lastVisibleRow) private void DrawData(List<RollColumn> visibleColumns, int firstVisibleRow, int lastVisibleRow)
{ {
int firstVisibleColumn = FirstVisibleColumn(visibleColumns); if (QueryItemText == null)
var lastVisibleColumn = LastVisibleColumn(visibleColumns, rect.Width);
// Prevent exceptions with small TAStudio windows
if (visibleColumns.Count == 0)
{ {
return; return;
} }
if (QueryItemText == null) if (!visibleColumns.Any())
{ {
return; return;
} }
@ -291,8 +288,7 @@ namespace BizHawk.Client.EmuHawk
for (int i = 0, f = 0; f < range; i++, f++) // Vertical for (int i = 0, f = 0; f < range; i++, f++) // Vertical
{ {
f += _lagFrames[i]; f += _lagFrames[i];
int lastVisible = lastVisibleColumn; for (int j = 0; j < visibleColumns.Count; j++) // Horizontal
for (int j = firstVisibleColumn; j <= lastVisible; j++) // Horizontal
{ {
RollColumn col = visibleColumns[j]; RollColumn col = visibleColumns[j];
@ -445,11 +441,11 @@ namespace BizHawk.Client.EmuHawk
// TODO refactor this and DoBackGroundCallback functions. // TODO refactor this and DoBackGroundCallback functions.
// Draw Gridlines and background colors using QueryItemBkColor. // Draw Gridlines and background colors using QueryItemBkColor.
private void DrawBg(List<RollColumn> visibleColumns, Rectangle rect) private void DrawBg(List<RollColumn> visibleColumns, Rectangle rect, int firstVisibleRow, int lastVisibleRow)
{ {
if (QueryItemBkColor != null) if (QueryItemBkColor != null)
{ {
DoBackGroundCallback(visibleColumns, rect.Width); DoBackGroundCallback(visibleColumns, firstVisibleRow, lastVisibleRow);
} }
if (GridLines) if (GridLines)
@ -461,14 +457,14 @@ namespace BizHawk.Client.EmuHawk
for (int i = 1; i < VisibleRows + 1; i++) for (int i = 1; i < VisibleRows + 1; i++)
{ {
int x = RowsToPixels(i); int x = RowsToPixels(i);
_renderer.Line(x, 1, x, _drawHeight); _renderer.Line(x, 1, x, rect.Height);
} }
// Rows // Rows
for (int i = 0; i < visibleColumns.Count + 1; i++) for (int i = 0; i < visibleColumns.Count + 1; i++)
{ {
int y = GetHColTop(i) - _vBar.Value; int y = GetHColTop(i) - _vBar.Value;
_renderer.Line(RowsToPixels(0) + 1, y, _drawWidth, y); _renderer.Line(RowsToPixels(0) + 1, y, rect.Width, y);
} }
} }
else else
@ -478,19 +474,19 @@ namespace BizHawk.Client.EmuHawk
foreach (var column in visibleColumns) foreach (var column in visibleColumns)
{ {
int x = column.Left - _hBar.Value; int x = column.Left - _hBar.Value;
_renderer.Line(x, y, x, Height - 1); _renderer.Line(x, y, x, rect.Height - 1);
} }
if (visibleColumns.Any()) if (visibleColumns.Any())
{ {
int x = TotalColWidth - _hBar.Value; int x = TotalColWidth - _hBar.Value;
_renderer.Line(x, y, x, Height - 1); _renderer.Line(x, y, x, rect.Height - 1);
} }
// Rows // Rows
for (int i = 1; i < VisibleRows + 1; i++) for (int i = 1; i < VisibleRows + 1; i++)
{ {
_renderer.Line(0, RowsToPixels(i), Width + 1, RowsToPixels(i)); _renderer.Line(0, RowsToPixels(i), rect.Width + 1, RowsToPixels(i));
} }
} }
} }
@ -590,29 +586,26 @@ namespace BizHawk.Client.EmuHawk
} }
// Calls QueryItemBkColor callback for all visible cells and fills in the background of those cells. // Calls QueryItemBkColor callback for all visible cells and fills in the background of those cells.
private void DoBackGroundCallback(List<RollColumn> visibleColumns, int width) private void DoBackGroundCallback(List<RollColumn> visibleColumns, int firstVisibleRow, int lastVisibleRow)
{ {
int startIndex = FirstVisibleRow; if (!visibleColumns.Any())
int range = Math.Min(LastVisibleRow, RowCount - 1) - startIndex + 1;
int lastVisibleColumn = LastVisibleColumn(visibleColumns, width);
int firstVisibleColumn = FirstVisibleColumn(visibleColumns);
// Prevent exceptions with small TAStudio windows
if (firstVisibleColumn < 0)
{ {
return; return;
} }
int startIndex = firstVisibleRow;
int range = Math.Min(lastVisibleRow, RowCount - 1) - startIndex + 1;
for (int i = 0, f = 0; f < range; i++, f++) for (int i = 0, f = 0; f < range; i++, f++)
{ {
f += _lagFrames[i]; f += _lagFrames[i];
Color rowColor = Color.White; Color rowColor = Color.White;
QueryRowBkColor?.Invoke(f + startIndex, ref rowColor); QueryRowBkColor?.Invoke(f + startIndex, ref rowColor);
for (int j = firstVisibleColumn; j <= lastVisibleColumn; j++) foreach (var column in visibleColumns)
{ {
Color itemColor = Color.White; Color itemColor = Color.White;
QueryItemBkColor?.Invoke(f + startIndex, visibleColumns[j], ref itemColor); QueryItemBkColor?.Invoke(f + startIndex, column, ref itemColor);
if (itemColor == Color.White) if (itemColor == Color.White)
{ {
@ -630,7 +623,7 @@ namespace BizHawk.Client.EmuHawk
{ {
var cell = new Cell var cell = new Cell
{ {
Column = visibleColumns[j], Column = column,
RowIndex = i RowIndex = i
}; };
DrawCellBG(itemColor, cell, visibleColumns); DrawCellBG(itemColor, cell, visibleColumns);

30
BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
View File

@ -284,14 +284,14 @@ namespace BizHawk.Client.EmuHawk
} }
else else
{ {
int x = _hBar.Value; int x = 0;
int y = ColumnHeight + 1; int y = ColumnHeight + 1;
int w = VisibleColumns.Any() int w = VisibleColumns.Any()
? Math.Min(VisibleColumns.Max(c => c.Right) - _hBar.Value, Width) ? Math.Min(VisibleColumns.Max(c => c.Right) - _hBar.Value, Width)
: 0; : 0;
int h = Height - y; int h = Math.Min(RowCount * CellHeight, Height - y);
Invalidate(new Rectangle(x, y, w, h)); Invalidate(new Rectangle(x, y, w, h));
} }
} }
@ -807,31 +807,7 @@ namespace BizHawk.Client.EmuHawk
return (rect.Width - MaxColumnWidth) / CellWidth; return (rect.Width - MaxColumnWidth) / CellWidth;
} }
return (rect.Height - ColumnHeight - 3) / CellHeight; // Minus three makes it work return rect.Height / CellHeight; // Minus three makes it work
}
// TODO: account for no visible columns
private int FirstVisibleColumn(List<RollColumn> columnList)
{
if (HorizontalOrientation)
{
return Enumerable.Range(0, columnList.Count).First(i => GetHColBottom(i) > _vBar.Value);
}
return columnList.FindIndex(c => c.Right > _hBar.Value);
}
private int LastVisibleColumn(List<RollColumn> columnList, int width)
{
if (HorizontalOrientation)
{
int count = columnList.Count;
return Enumerable.Range(0, count)
.Select(i => count - 1 - i)
.First(i => GetHColTop(i) <= _drawWidth + _hBar.Value);
}
return columnList.FindLastIndex(c => c.Left <= _drawWidth + _hBar.Value && c.Left < width);
} }
private Cell _draggingCell; private Cell _draggingCell;