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

Tastudio - fix wrong column width when loading a tasproj that was saved with HorizontalOrientation

This commit is contained in:
adelikat 2019-12-03 19:10:18 -06:00
parent c2b942d9a4
commit 76a52062d6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -752,7 +752,7 @@ namespace BizHawk.Client.EmuHawk
{
if (HorizontalOrientation)
{
return (_drawWidth - ColumnWidth) / CellWidth;
return (_drawWidth - MaxColumnWidth) / CellWidth;
}
return (_drawHeight - ColumnHeight - 3) / CellHeight; // Minus three makes it work
@ -1577,7 +1577,7 @@ namespace BizHawk.Client.EmuHawk
RecalculateScrollBars();
if (_columns.VisibleColumns.Any())
{
ColumnWidth = _columns.VisibleColumns.Max(c => c.Width) + CellWidthPadding * 4;
MaxColumnWidth = _columns.VisibleColumns.Max(c => c.Width) + CellWidthPadding * 4;
}
}
@ -1872,7 +1872,7 @@ namespace BizHawk.Client.EmuHawk
{
if (_horizontalOrientation)
{
return (index * CellWidth) + ColumnWidth;
return (index * CellWidth) + MaxColumnWidth;
}
return (index * CellHeight) + ColumnHeight;
@ -1888,7 +1888,7 @@ namespace BizHawk.Client.EmuHawk
// Using Math.Floor and float because integer division rounds towards 0 but we want to round down.
if (_horizontalOrientation)
{
return (int)Math.Floor((float)(pixels - ColumnWidth) / CellWidth);
return (int)Math.Floor((float)(pixels - MaxColumnWidth) / CellWidth);
}
return (int)Math.Floor((float)(pixels - ColumnHeight) / CellHeight);
@ -1904,7 +1904,7 @@ namespace BizHawk.Client.EmuHawk
GetHColTop(index) + GetHColHeight(index);
// The width of the largest column cell in Horizontal Orientation
private int ColumnWidth { get; set; }
private int MaxColumnWidth { get; set; }
// The height of a column cell in Vertical Orientation.
private int ColumnHeight { get; set; }
@ -1935,7 +1935,11 @@ namespace BizHawk.Client.EmuHawk
CellHeight = (int)_charSize.Height + (CellHeightPadding * 2);
CellWidth = (int)_charSize.Width + (CellWidthPadding * 4); // Double the padding for horizontal because it looks better
ColumnWidth = CellWidth;
if (_columns.VisibleColumns.Any())
{
MaxColumnWidth = _columns.VisibleColumns.Max(c => c.Width) + CellWidthPadding * 4;
}
ColumnHeight = CellHeight + 2;
}