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

Merge pull request #2718 from Mailaender/admin-indicator

Browse Source 
remove admin indicator icon to avoid confusion/overlapping
This commit is contained in:
Chris Forbes
2013-03-03 01:35:15 -08:00
parent 38b2b6cb4e 4cf8f9a434
commit 5426e2c831
10 changed files with 7 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs
View File

@@ -399,6 +399,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{ // Non-editable player in slot
template = NonEditablePlayerTemplate.Clone();
template.Get<LabelWidget>("NAME").GetText = () => client.Name;
if (client.IsAdmin)
template.Get<LabelWidget>("NAME").Font = "Bold";
var color = template.Get<ColorBlockWidget>("COLOR");
color.GetColor = () => client.ColorRamp.GetColor(0);
@@ -421,8 +423,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + client.Index));
}
template.Get<ImageWidget>("ISADMIN").IsVisible = () => client != null && client.IsAdmin;
template.IsVisible = () => true;
Players.AddChild(template);
}
@@ -458,6 +458,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
template = NonEditableSpectatorTemplate.Clone();
template.Get<LabelWidget>("NAME").GetText = () => c.Name;
if (client.IsAdmin)
template.Get<LabelWidget>("NAME").Font = "Bold";
var color = template.Get<ColorBlockWidget>("COLOR");
color.GetColor = () => c.ColorRamp.GetColor(0);
@@ -469,8 +471,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
kickButton.OnClick = () => orderManager.IssueOrder(Order.Command("kick " + c.Index));
}
template.Get<ImageWidget>("ISADMIN").IsVisible = () => c.IsAdmin;
template.IsVisible = () => true;
Players.AddChild(template);
}

2
OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs
View File

@@ -23,6 +23,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
{
public static void SetupNameWidget(OrderManager orderManager, Session.Client c, TextFieldWidget name)
{
if (c.IsAdmin)
name.Font = "Bold";
name.Text = c.Name;
name.OnEnterKey = () =>
{