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

Adjust lobby tooltip plumbing:

Browse Source 
- Pass Client instead of Client ID
- Pass WorldRenderer and OrderManager to util helpers.
This commit is contained in:
Paul Chote
2018-07-06 20:51:00 +01:00
committed by abcdefg30
parent 97c03b00f2
commit 630936a211
4 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.Common/Widgets/Logic/Lobby/LatencyTooltipLogic.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public class LatencyTooltipLogic : ChromeLogic
{
[ObjectCreator.UseCtor]
public LatencyTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, OrderManager orderManager, int clientIndex)
public LatencyTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, OrderManager orderManager, Session.Client client)
{
var latencyPrefix = widget.Get<LabelWidget>("LATENCY_PREFIX");
var latencyPrefixFont = Game.Renderer.Fonts[latencyPrefix.Font];
@@ -29,14 +29,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
latency.Bounds.X = latencyPrefix.Bounds.X + latencyPrefixFont.Measure(latencyPrefix.Text + " ").X;
widget.IsVisible = () => orderManager.LobbyInfo.ClientWithIndex(clientIndex) != null;
widget.IsVisible = () => client != null;
tooltipContainer.BeforeRender = () =>
{
if (widget.IsVisible())
widget.Bounds.Width = latency.Bounds.X + latencyFont.Measure(latency.GetText()).X + rightMargin;
};
var client = orderManager.LobbyInfo.ClientWithIndex(clientIndex);
var ping = orderManager.LobbyInfo.PingFromClient(client);
latency.GetText = () => LobbyUtils.LatencyDescription(ping);
latency.GetColor = () => LobbyUtils.LatencyColor(ping);