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

Make SetupLatencyWidget consistent with SetupProfileWidget.

Browse Source
This commit is contained in:
Paul Chote
2018-08-25 19:16:07 +00:00
committed by reaperrr
parent 0c098e74f1
commit 48f2519811
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyLogic.cs
View File

@@ -576,7 +576,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (template == null || template.Id != editablePlayerTemplate.Id) if (template == null || template.Id != editablePlayerTemplate.Id)
template = editablePlayerTemplate.Clone(); template = editablePlayerTemplate.Clone();
LobbyUtils.SetupLatencyWidget(template, client, orderManager, client.Bot == null); LobbyUtils.SetupLatencyWidget(template, client, orderManager);
if (client.Bot != null) if (client.Bot != null)
LobbyUtils.SetupEditableSlotWidget(template, slot, client, orderManager, worldRenderer, map); LobbyUtils.SetupEditableSlotWidget(template, slot, client, orderManager, worldRenderer, map);
@@ -595,7 +595,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (template == null || template.Id != nonEditablePlayerTemplate.Id) if (template == null || template.Id != nonEditablePlayerTemplate.Id)
template = nonEditablePlayerTemplate.Clone(); template = nonEditablePlayerTemplate.Clone();
LobbyUtils.SetupLatencyWidget(template, client, orderManager, client.Bot == null); LobbyUtils.SetupLatencyWidget(template, client, orderManager);
LobbyUtils.SetupColorWidget(template, slot, client); LobbyUtils.SetupColorWidget(template, slot, client);
LobbyUtils.SetupFactionWidget(template, slot, client, factions); LobbyUtils.SetupFactionWidget(template, slot, client, factions);
@@ -667,7 +667,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
LobbyUtils.HideReadyWidgets(template); LobbyUtils.HideReadyWidgets(template);
} }
LobbyUtils.SetupLatencyWidget(template, c, orderManager, true); LobbyUtils.SetupLatencyWidget(template, c, orderManager);
template.IsVisible = () => true; template.IsVisible = () => true;
if (idx >= players.Children.Count) if (idx >= players.Children.Count)

7
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -296,8 +296,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return "Poor"; return "Poor";
} }
public static void SetupLatencyWidget(Widget parent, Session.Client c, OrderManager orderManager, bool visible) public static void SetupLatencyWidget(Widget parent, Session.Client c, OrderManager orderManager)
{ {
var visible = c != null && c.Bot == null;
var block = parent.GetOrNull("LATENCY"); var block = parent.GetOrNull("LATENCY");
if (block != null) if (block != null)
{ {
@@ -309,8 +310,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
} }
var tooltip = parent.Get<ClientTooltipRegionWidget>("LATENCY_REGION"); var tooltip = parent.Get<ClientTooltipRegionWidget>("LATENCY_REGION");
tooltip.IsVisible = () => c != null && visible; tooltip.IsVisible = () => visible;
if (c != null) if (visible)
tooltip.Bind(orderManager, null, c); tooltip.Bind(orderManager, null, c);
} }