epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix and simplify ScrollPanelWidget thumb rect calculation.

Browse Source
This commit is contained in:
Paul Chote
2020-03-25 20:51:45 +00:00
committed by abcdefg30
parent 09014ab6d5
commit b2f7f67756
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs
View File

@@ -146,13 +146,16 @@ namespace OpenRA.Mods.Common.Widgets
UpdateSmoothScrolling(); UpdateSmoothScrolling();
var rb = RenderBounds; var rb = RenderBounds;
var scrollbarHeight = rb.Height - 2 * ScrollbarWidth; var scrollbarHeight = rb.Height - 2 * ScrollbarWidth;
var thumbHeight = ContentHeight == 0 ? 0 : Math.Max(MinimumThumbSize, (int)(scrollbarHeight * Math.Min(rb.Height * 1f / ContentHeight, 1f))); // Scroll thumb is only visible if the content does not fit within the panel bounds
var thumbOrigin = rb.Y + ScrollbarWidth + (int)((scrollbarHeight - thumbHeight) * (-1f * currentListOffset / (ContentHeight - rb.Height))); var thumbHeight = 0;
if (thumbHeight == scrollbarHeight) var thumbOrigin = rb.Y + ScrollbarWidth;
thumbHeight = 0; if (ContentHeight > rb.Height)
{
thumbHeight = Math.Max(MinimumThumbSize, scrollbarHeight * rb.Height / ContentHeight);
thumbOrigin += (int)((scrollbarHeight - thumbHeight) * currentListOffset / (rb.Height - ContentHeight));
}
switch (ScrollBar) switch (ScrollBar)
{ {