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

Add suffix to player name in shroud selector

Browse Source
This commit is contained in:
Ivaylo Draganov
2020-05-18 17:53:40 +03:00
committed by Paul Chote
parent 7a213338a2
commit 31a965b29a
13 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/GameInfoStatsLogic.cs
View File

@@ -93,7 +93,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
LobbyUtils.SetupProfileWidget(item, client, orderManager, worldRenderer);
var nameLabel = item.Get<LabelWidget>("NAME");
WidgetUtils.AddSuffixToPlayerNameLabel(nameLabel, pp);
WidgetUtils.BindPlayerNameAndStatus(nameLabel, pp);
nameLabel.GetColor = () => pp.Color;
var flag = item.Get<ImageWidget>("FACTIONFLAG");

17
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverShroudSelectorLogic.cs
View File

@@ -33,6 +33,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly World world;
CameraOption selected;
LabelWidget shroudLabel;
class CameraOption
{
@@ -50,7 +51,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Color = p.Color;
Faction = p.Faction.InternalName;
IsSelected = () => p.World.RenderPlayer == p;
OnClick = () => { p.World.RenderPlayer = p; logic.selected = this; p.World.Selection.Clear(); };
OnClick = () =>
{
p.World.RenderPlayer = p;
logic.selected = this;
p.World.Selection.Clear();
WidgetUtils.BindPlayerNameAndStatus(logic.shroudLabel, p);
};
}
public CameraOption(ObserverShroudSelectorLogic logic, World w, string label, Player p)
@@ -107,9 +114,13 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var label = item.Get<LabelWidget>("LABEL");
label.IsVisible = () => showFlag;
label.GetText = () => option.Label;
label.GetColor = () => option.Color;
if (showFlag)
WidgetUtils.BindPlayerNameAndStatus(label, option.Player);
else
label.GetText = () => option.Label;
var flag = item.Get<ImageWidget>("FLAG");
flag.IsVisible = () => showFlag;
flag.GetImageCollection = () => "flags";
@@ -126,7 +137,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
shroudSelector.ShowDropDown("SPECTATOR_DROPDOWN_TEMPLATE", 400, groups, setupItem);
};
var shroudLabel = shroudSelector.Get<LabelWidget>("LABEL");
shroudLabel = shroudSelector.Get<LabelWidget>("LABEL");
shroudLabel.IsVisible = () => selected.Faction != null;
shroudLabel.GetText = () => selected.Label;
shroudLabel.GetColor = () => selected.Color;

2
OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs
View File

@@ -526,7 +526,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
flag.GetImageName = () => player.Faction.InternalName;
var playerName = template.Get<LabelWidget>("PLAYER");
WidgetUtils.AddSuffixToPlayerNameLabel(playerName, player);
WidgetUtils.BindPlayerNameAndStatus(playerName, player);
playerName.GetColor = () => player.Color;
}

22
OpenRA.Mods.Common/Widgets/WidgetUtils.cs
View File

@@ -272,21 +272,23 @@ namespace OpenRA.Mods.Common.Widgets
button.GetTooltipText = null;
}
public static void AddSuffixToPlayerNameLabel(LabelWidget label, Player p)
public static void BindPlayerNameAndStatus(LabelWidget label, Player p)
{
var client = p.World.LobbyInfo.ClientWithIndex(p.ClientIndex);
var playerNameFont = Game.Renderer.Fonts[label.Font];
var suffixLength = new CachedTransform<string, int>(s => playerNameFont.Measure(s).X);
var name = new CachedTransform<Pair<string, string>, string>(c =>
WidgetUtils.TruncateText(c.First, label.Bounds.Width - suffixLength.Update(c.Second), playerNameFont));
var nameFont = Game.Renderer.Fonts[label.Font];
var name = new CachedTransform<Tuple<string, WinState, Session.ClientState>, string>(c =>
{
var suffix = c.Item2 == WinState.Undefined ? "" : " (" + c.Item2 + ")";
if (c.Item3 == Session.ClientState.Disconnected)
suffix = " (Gone)";
return TruncateText(c.Item1, label.Bounds.Width - nameFont.Measure(suffix).X, nameFont) + suffix;
});
label.GetText = () =>
{
var suffix = p.WinState == WinState.Undefined ? "" : " (" + p.WinState + ")";
if (client != null && client.State == Session.ClientState.Disconnected)
suffix = " (Gone)";
return name.Update(Pair.New(p.PlayerName, suffix)) + suffix;
var clientState = client != null ? client.State : Session.ClientState.Ready;
return name.Update(Tuple.Create(p.PlayerName, p.WinState, clientState));
};
}
}

2
mods/cnc/chrome/dialogs.yaml
View File

@@ -142,7 +142,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Height: 16
Label@LABEL:
X: 40
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/cnc/chrome/ingame.yaml
View File

@@ -271,7 +271,7 @@ Container@OBSERVER_WIDGETS:
Height: 16
Label@LABEL:
X: 40
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/common/chrome/dropdowns.yaml
View File

@@ -108,7 +108,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Height: 16
Label@LABEL:
X: 40
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/common/chrome/ingame-observer.yaml
View File

@@ -74,7 +74,7 @@ Container@OBSERVER_WIDGETS:
Y: 2
Label@LABEL:
X: 34
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/d2k/chrome/dropdowns.yaml
View File

@@ -104,7 +104,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Y: 2
Label@LABEL:
X: 34
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/d2k/chrome/ingame-observer.yaml
View File

@@ -94,7 +94,7 @@ Container@OBSERVER_WIDGETS:
Y: 2
Label@LABEL:
X: 34
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/ra/chrome/ingame-observer.yaml
View File

@@ -108,7 +108,7 @@ Container@OBSERVER_WIDGETS:
Height: 16
Label@LABEL:
X: 40
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/ts/chrome/dropdowns.yaml
View File

@@ -104,7 +104,7 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
Height: 16
Label@LABEL:
X: 40
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL:

2
mods/ts/chrome/ingame-observer.yaml
View File

@@ -94,7 +94,7 @@ Container@OBSERVER_WIDGETS:
Y: 5
Label@LABEL:
X: 34
Width: 60
Width: PARENT_RIGHT
Height: 25
Shadow: True
Label@NOFLAG_LABEL: