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

InputRoll - in horizontal orientation, account for the draw area being shorter than the height of the columns

This commit is contained in:
adelikat 2019-12-07 09:55:02 -06:00
parent 0d2770044a
commit ea6704a2b8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,11 +21,15 @@ namespace BizHawk.Client.EmuHawk
// Lag frame calculations // Lag frame calculations
SetLagFramesArray(); SetLagFramesArray();
CalculateHorizontalColumnPositions(VisibleColumns.ToList());
List<RollColumn> visibleColumns; List<RollColumn> visibleColumns;
if (HorizontalOrientation) if (HorizontalOrientation)
{ {
visibleColumns = VisibleColumns.ToList(); // TODO visibleColumns = VisibleColumns
.Take(_horizontalColumnTops.Count(c => c < e.ClipRectangle.Height))
.ToList();
} }
else else
{ {
@ -42,8 +46,6 @@ namespace BizHawk.Client.EmuHawk
var lastVisibleRow = firstVisibleRow + visibleRows; var lastVisibleRow = firstVisibleRow + visibleRows;
CalculateHorizontalColumnPositions(visibleColumns);
var needsColumnRedraw = HorizontalOrientation || e.ClipRectangle.Y < ColumnHeight; var needsColumnRedraw = HorizontalOrientation || e.ClipRectangle.Y < ColumnHeight;
if (visibleColumns.Any() && needsColumnRedraw) if (visibleColumns.Any() && needsColumnRedraw)
{ {

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

@ -285,6 +285,8 @@ namespace BizHawk.Client.EmuHawk
int h = VisibleColumns.Any() int h = VisibleColumns.Any()
? GetHColBottom(VisibleColumns.Count() - 1) ? GetHColBottom(VisibleColumns.Count() - 1)
: 0; : 0;
h = Math.Min(h, _drawHeight);
Invalidate(new Rectangle(x, y, w, h)); Invalidate(new Rectangle(x, y, w, h));
} }
else else