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

InputRoll - get Horizontal orientation invalidating logic going and fix some bugs in horizontal drawing logic

This commit is contained in:
adelikat 2019-12-07 09:27:56 -06:00
parent 891df3512a
commit 421c460d68
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,14 +21,26 @@ namespace BizHawk.Client.EmuHawk
// Lag frame calculations
SetLagFramesArray();
var visibleColumns = _columns.VisibleColumns
.Where(c => c.Right > _hBar.Value)
.Where(c => c.Left - _hBar.Value < e.ClipRectangle.Width)
.ToList();
List<RollColumn> visibleColumns;
if (HorizontalOrientation)
{
visibleColumns = VisibleColumns.ToList(); // TODO
}
else
{
visibleColumns = _columns.VisibleColumns
.Where(c => c.Right > _hBar.Value)
.Where(c => c.Left - _hBar.Value < e.ClipRectangle.Width)
.ToList();
}
// TODO: FirstVisibleRow assumes there is a visible row
var firstVisibleRow = FirstVisibleRow;
var lastVisibleRow = firstVisibleRow + CalcVisibleRows(e.ClipRectangle);
var visibleRows = CalcVisibleRows(e.ClipRectangle);
var lastVisibleRow = firstVisibleRow + visibleRows;
CalculateHorizontalColumnPositions(visibleColumns);
var needsColumnRedraw = HorizontalOrientation || e.ClipRectangle.Y < ColumnHeight;
@ -227,8 +239,7 @@ namespace BizHawk.Client.EmuHawk
if (HorizontalOrientation)
{
int lastVisible = lastVisibleRow;
for (int j = firstVisibleRow; j <= lastVisible; j++)
for (int j = 0; j < visibleColumns.Count; j++)
{
RollColumn col = visibleColumns[j];
int colHeight = GetHColHeight(j);
@ -454,7 +465,7 @@ namespace BizHawk.Client.EmuHawk
if (HorizontalOrientation)
{
// Columns
for (int i = 1; i < VisibleRows + 1; i++)
for (int i = 1; i < lastVisibleRow - firstVisibleRow + 1; i++)
{
int x = RowsToPixels(i);
_renderer.Line(x, 1, x, rect.Height);
@ -463,8 +474,11 @@ namespace BizHawk.Client.EmuHawk
// Rows
for (int i = 0; i < visibleColumns.Count + 1; i++)
{
// TODO: MaxColumnWidth shouldn't be necessary
// This also makes too many assumptions, the parameters need to drive what is being drawn
int y = GetHColTop(i) - _vBar.Value;
_renderer.Line(RowsToPixels(0) + 1, y, rect.Width, y);
int x = RowsToPixels(0) + 1;
_renderer.Line(x, y, rect.Width + MaxColumnWidth, y);
}
}
else

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

@ -280,7 +280,13 @@ namespace BizHawk.Client.EmuHawk
// TODO: horizontal orientation
if (HorizontalOrientation)
{
Refresh();
int x = MaxColumnWidth;
int y = 0;
int w = Width - x;
int h = VisibleColumns.Any()
? GetHColBottom(VisibleColumns.Count() - 1)
: 0;
Invalidate(new Rectangle(x, y, w, h));
}
else
{
@ -804,7 +810,7 @@ namespace BizHawk.Client.EmuHawk
{
if (HorizontalOrientation)
{
return (rect.Width - MaxColumnWidth) / CellWidth;
return rect.Width / CellWidth;
}
return rect.Height / CellHeight; // Minus three makes it work