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

fix RecalculateScrollBars 

- closes #4133.

This has a 50% chance of breaking something else (it either happens or doesn't), but should be more correct. Mainly, RecalculateScrollbars was called based on visible rows which depend on whether scrollbars are visible or not, but the NeedsVScrollbar calculation did not take the existence of the HScrollbar into account, leading to an off-by-one. I think.
This commit is contained in:
Morilli 2024-12-05 22:50:10 +01:00
parent 49458ab182
commit 69b61b574d
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
View File

@ -1664,27 +1664,43 @@ namespace BizHawk.Client.EmuHawk
}
}
// ScrollBar.Maximum = DesiredValue + ScrollBar.LargeChange - 1
// See MSDN Page for more information on the dumb ScrollBar.Maximum Property
private void RecalculateScrollBars()
private void CalculateScrollbarsNeeded(int lastVisibleColumn)
{
UpdateDrawSize();
var columns = _columns.VisibleColumns.ToList();
int iLastColumn = columns.Count - 1;
if (HorizontalOrientation)
{
NeedsVScrollbar = GetHColBottom(iLastColumn) > _drawHeight;
NeedsVScrollbar = GetHColBottom(lastVisibleColumn) > _drawHeight;
NeedsHScrollbar = RowCount > 1;
}
else
{
NeedsVScrollbar = ColumnHeight + (RowCount * CellHeight) > Height;
NeedsVScrollbar = ColumnHeight + (RowCount * CellHeight) > _drawHeight;
NeedsHScrollbar = TotalColWidth - _drawWidth + 1 > 0;
}
UpdateDrawSize();
// if either NeedsVScrollbar or NeedsHScrollbar changed we need to recalculate, so just run this again
if (HorizontalOrientation)
{
NeedsVScrollbar = GetHColBottom(lastVisibleColumn) > _drawHeight;
NeedsHScrollbar = RowCount > 1;
}
else
{
NeedsVScrollbar = ColumnHeight + (RowCount * CellHeight) > _drawHeight;
NeedsHScrollbar = TotalColWidth - _drawWidth + 1 > 0;
}
UpdateDrawSize();
}
// ScrollBar.Maximum = DesiredValue + ScrollBar.LargeChange - 1
// See MSDN Page for more information on the dumb ScrollBar.Maximum Property
private void RecalculateScrollBars()
{
int lastVisibleColumn = _columns.VisibleColumns.Count() - 1;
CalculateScrollbarsNeeded(lastVisibleColumn);
if (VisibleRows > 0)
{
if (HorizontalOrientation)
@ -1708,7 +1724,7 @@ namespace BizHawk.Client.EmuHawk
{
if (HorizontalOrientation)
{
_vBar.Maximum = GetHColBottom(iLastColumn) - _drawHeight + _vBar.LargeChange;
_vBar.Maximum = GetHColBottom(lastVisibleColumn) - _drawHeight + _vBar.LargeChange;
if (_vBar.Maximum < 0)
{
_vBar.Maximum = 0;