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

Fix flickering tooltip

Browse Source
This commit is contained in:
rob-v
2017-05-27 09:21:10 +02:00
committed by Paul Chote
parent 7772ebedf4
commit 1b3422db2d
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -539,8 +539,6 @@ namespace OpenRA
var integralTickTimestep = (uiTickDelta / Timestep) * Timestep; var integralTickTimestep = (uiTickDelta / Timestep) * Timestep;
Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep; Ui.LastTickTime += integralTickTimestep >= TimestepJankThreshold ? integralTickTimestep : Timestep;
Viewport.TicksSinceLastMove += uiTickDelta / Timestep;
Sync.CheckSyncUnchanged(world, Ui.Tick); Sync.CheckSyncUnchanged(world, Ui.Tick);
Cursor.Tick(); Cursor.Tick();
} }

2
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -80,7 +80,7 @@ namespace OpenRA.Graphics
} }
} }
public static long TicksSinceLastMove = 0; public static long LastMoveRunTime = 0;
public static int2 LastMousePos; public static int2 LastMousePos;
float ClosestTo(float[] collection, float target) float ClosestTo(float[] collection, float target)

2
OpenRA.Game/Widgets/Widget.cs
View File

@@ -108,7 +108,7 @@ namespace OpenRA.Widgets
if (mi.Event == MouseInputEvent.Move) if (mi.Event == MouseInputEvent.Move)
{ {
Viewport.LastMousePos = mi.Location; Viewport.LastMousePos = mi.Location;
Viewport.TicksSinceLastMove = 0; Viewport.LastMoveRunTime = Game.RunTime;
} }
if (wasMouseOver != MouseOverWidget) if (wasMouseOver != MouseOverWidget)

4
OpenRA.Mods.Common/Widgets/TooltipContainerWidget.cs
View File

@@ -24,12 +24,12 @@ namespace OpenRA.Mods.Common.Widgets
public int BottomEdgeYOffset = -5; public int BottomEdgeYOffset = -5;
public Action BeforeRender = Nothing; public Action BeforeRender = Nothing;
public int TooltipDelay = 5; public int TooltipDelayMilliseconds = 200;
Widget tooltip; Widget tooltip;
public TooltipContainerWidget() public TooltipContainerWidget()
{ {
IsVisible = () => Viewport.TicksSinceLastMove >= TooltipDelay; IsVisible = () => Game.RunTime > Viewport.LastMoveRunTime + TooltipDelayMilliseconds;
} }
public void SetTooltip(string id, WidgetArgs args) public void SetTooltip(string id, WidgetArgs args)