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

Evaluate smooth scrolling per-frame instead of per-tick.

Browse Source
This commit is contained in:
Paul Chote
2018-12-31 09:21:38 +00:00
committed by reaperrr
parent bb5e0eafba
commit d7c54d74ad
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,6 +46,8 @@ namespace OpenRA.Mods.Common.Widgets
public int MinimumThumbSize = 10; public int MinimumThumbSize = 10;
public ScrollPanelAlign Align = ScrollPanelAlign.Top; public ScrollPanelAlign Align = ScrollPanelAlign.Top;
public bool CollapseHiddenChildren; public bool CollapseHiddenChildren;
// Fraction of the remaining scroll-delta to move in 40ms
public float SmoothScrollSpeed = 0.333f; public float SmoothScrollSpeed = 0.333f;
protected bool upPressed; protected bool upPressed;
@@ -65,6 +67,10 @@ namespace OpenRA.Mods.Common.Widgets
// The current value is the actual list offset at the moment // The current value is the actual list offset at the moment
float currentListOffset; float currentListOffset;
// The Game.Runtime value when UpdateSmoothScrolling was last called
// Used for calculating the per-frame smooth-scrolling delta
long lastSmoothScrollTime = 0;
// Setting "smooth" to true will only update the target list offset. // Setting "smooth" to true will only update the target list offset.
// Setting "smooth" to false will also set the current list offset, // Setting "smooth" to false will also set the current list offset,
// i.e. it will scroll immediately. // i.e. it will scroll immediately.
@@ -129,6 +135,8 @@ namespace OpenRA.Mods.Common.Widgets
if (!IsVisible()) if (!IsVisible())
return; return;
UpdateSmoothScrolling();
var rb = RenderBounds; var rb = RenderBounds;
var scrollbarHeight = rb.Height - 2 * ScrollbarWidth; var scrollbarHeight = rb.Height - 2 * ScrollbarWidth;
@@ -253,6 +261,29 @@ namespace OpenRA.Mods.Common.Widgets
ScrollToItem(item); ScrollToItem(item);
} }
void UpdateSmoothScrolling()
{
if (lastSmoothScrollTime == 0)
{
lastSmoothScrollTime = Game.RunTime;
return;
}
var offsetDiff = targetListOffset - currentListOffset;
var absOffsetDiff = Math.Abs(offsetDiff);
if (absOffsetDiff > 1f)
{
var dt = Game.RunTime - lastSmoothScrollTime;
currentListOffset += offsetDiff * SmoothScrollSpeed.Clamp(0.1f, 1.0f) * dt / 40;
Ui.ResetTooltips();
}
else
SetListOffset(targetListOffset, false);
lastSmoothScrollTime = Game.RunTime;
}
public override void Tick() public override void Tick()
{ {
if (upPressed) if (upPressed)
@@ -260,17 +291,6 @@ namespace OpenRA.Mods.Common.Widgets
if (downPressed) if (downPressed)
Scroll(-1); Scroll(-1);
var offsetDiff = targetListOffset - currentListOffset;
var absOffsetDiff = Math.Abs(offsetDiff);
if (absOffsetDiff > 1f)
{
currentListOffset += offsetDiff * SmoothScrollSpeed.Clamp(0.1f, 1.0f);
Ui.ResetTooltips();
}
else
SetListOffset(targetListOffset, false);
} }
public override bool YieldMouseFocus(MouseInput mi) public override bool YieldMouseFocus(MouseInput mi)