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

Tweak flag size, kill Spawn button.

Browse Source
This commit is contained in:
alzeih
2010-06-13 19:03:02 +12:00
parent 1a20249f44
commit 5d66c6b7ba
5 changed files with 84 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
View File

@@ -79,17 +79,12 @@ namespace OpenRA.Widgets.Delegates
var faction = template.GetWidget<ButtonWidget>("FACTION"); var faction = template.GetWidget<ButtonWidget>("FACTION");
faction.OnMouseUp = CycleRace; faction.OnMouseUp = CycleRace;
faction.GetText = () => c.Country; var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME");
factionname.GetText = () => c.Country;
//TODO: make part of button? var factionflag = faction.GetWidget<ImageWidget>("FACTIONFLAG");
var factionflag = template.GetWidget<ImageWidget>("FACTIONFLAG");
factionflag.GetImageName = () => c.Country; factionflag.GetImageName = () => c.Country;
factionflag.GetImageCollection = () => "flags"; factionflag.GetImageCollection = () => "flags";
var spawn = template.GetWidget<ButtonWidget>("SPAWN");
spawn.OnMouseUp = CycleSpawnPoint;
spawn.GetText = () => (c.SpawnPoint == 0) ? "-" : c.SpawnPoint.ToString();
var team = template.GetWidget<ButtonWidget>("TEAM"); var team = template.GetWidget<ButtonWidget>("TEAM");
team.OnMouseUp = CycleTeam; team.OnMouseUp = CycleTeam;
team.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString(); team.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString();
@@ -104,15 +99,12 @@ namespace OpenRA.Widgets.Delegates
color.GetColor = () => Game.world.PlayerColors()[c.PaletteIndex % Game.world.PlayerColors().Count].Color; color.GetColor = () => Game.world.PlayerColors()[c.PaletteIndex % Game.world.PlayerColors().Count].Color;
var faction = template.GetWidget<LabelWidget>("FACTION"); var faction = template.GetWidget<LabelWidget>("FACTION");
faction.GetText = () => c.Country; var factionname = faction.GetWidget<LabelWidget>("FACTIONNAME");
factionname.GetText = () => c.Country;
var factionflag = template.GetWidget<ImageWidget>("FACTIONFLAG"); var factionflag = faction.GetWidget<ImageWidget>("FACTIONFLAG");
factionflag.GetImageName = () => c.Country; factionflag.GetImageName = () => c.Country;
factionflag.GetImageCollection = () => "flags"; factionflag.GetImageCollection = () => "flags";
var spawn = template.GetWidget<LabelWidget>("SPAWN");
spawn.GetText = () => (c.SpawnPoint == 0) ? "-" : c.SpawnPoint.ToString();
var team = template.GetWidget<LabelWidget>("TEAM"); var team = template.GetWidget<LabelWidget>("TEAM");
team.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString(); team.GetText = () => (c.Team == 0) ? "-" : c.Team.ToString();

6
mods/cnc/chrome.xml
View File

@@ -197,8 +197,8 @@
<image name="disabled" x="68" y="56" width="34" height="28" /> <image name="disabled" x="68" y="56" width="34" height="28" />
</collection> </collection>
<collection name="flags" src="buttons.png"> <collection name="flags" src="buttons.png">
<image name="GDI" x="0" y="56" width="30" height="25" /> <image name="GDI" x="0" y="56" width="30" height="15" />
<image name="Nod" x="0" y="56" width="30" height="25" /> <image name="Nod" x="0" y="56" width="30" height="15" />
<image name="Random" x="0" y="56" width="30" height="25" /> <image name="Random" x="0" y="56" width="30" height="15" />
</collection> </collection>
</chrome> </chrome>

82
mods/cnc/menus.yaml
View File

@@ -339,34 +339,34 @@ Container:
Height:PARENT_BOTTOM-12 Height:PARENT_BOTTOM-12
Button@FACTION: Button@FACTION:
Id:FACTION Id:FACTION
Text:Faction Width:100
Width:60
Height:25 Height:25
X:180 X:180
Y:0 Y:0
Image@FACTIONFLAG: Children:
Id:FACTIONFLAG Image@FACTIONFLAG:
Width:30 Id:FACTIONFLAG
Height:25 Width:30
X:235 Height:15
Y:0 X:1
Button@SPAWN: Y:5
Id:SPAWN Label@FACTIONNAME:
Text:Spawn Id:FACTIONNAME
Width:70 Text:Faction
Height:25 Width:60
X:275 Height:25
Y:0 X:35
Y:5
Button@TEAM: Button@TEAM:
Id:TEAM Id:TEAM
Text:Team Text:Team
Width:70 Width:70
Height:25 Height:25
X:355 X:295
Y:0 Y:0
Checkbox@STATUS: Checkbox@STATUS:
Id:STATUS Id:STATUS
X:455 X:380
Y:1 Y:1
Width:20 Width:20
Height:20 Height:20
@@ -393,37 +393,35 @@ Container:
Height:13 Height:13
Label@FACTION: Label@FACTION:
Id:FACTION Id:FACTION
Text:Faction Width:100
Width:60
Height:25 Height:25
X:180 X:180
Y:0 Y:0
Align:Center Children:
Image@FACTIONFLAG: Image@FACTIONFLAG:
Id:FACTIONFLAG Id:FACTIONFLAG
Width:30 Width:30
Height:25 Height:15
X:235 X:1
Y:0 Y:5
Label@SPAWN: Label@FACTIONNAME:
Id:SPAWN Id:FACTIONNAME
Text:Spawn Text:Faction
Width:70 Width:60
Height:25 Height:25
X:275 X:35
Y:0 Y:5
Align:Center
Label@TEAM: Label@TEAM:
Id:TEAM Id:TEAM
Text:Team Text:Team
Width:70 Width:70
Height:25 Height:25
X:355 X:295
Y:0 Y:0
Align:Center Align:Center
Checkbox@STATUS: Checkbox@STATUS:
Id:STATUS Id:STATUS
X:455 X:380
Y:1 Y:1
Width:20 Width:20
Height:20 Height:20
@@ -454,25 +452,17 @@ Container:
Y:0 Y:0
Text:Faction Text:Faction
Align:Center Align:Center
Label@LABEL_LOBBY_SPAWN:
Id:LABEL_LOBBY_SPAWN
Width:70
Height:25
X:275
Y:0
Text:Spawn
Align:Center
Label@LABEL_LOBBY_TEAM: Label@LABEL_LOBBY_TEAM:
Id:LABEL_LOBBY_TEAM Id:LABEL_LOBBY_TEAM
Width:70 Width:70
Height:25 Height:25
X:355 X:295
Y:0 Y:0
Text:Team Text:Team
Align:Center Align:Center
Label@LABEL_LOBBY_STATUS: Label@LABEL_LOBBY_STATUS:
Id:LABEL_LOBBY_STATUS Id:LABEL_LOBBY_STATUS
X:455 X:380
Y:0 Y:0
Width:20 Width:20
Height:20 Height:20

6
mods/ra/chrome.xml
View File

@@ -190,8 +190,8 @@
<image name="disabled" x="68" y="56" width="34" height="28" /> <image name="disabled" x="68" y="56" width="34" height="28" />
</collection> </collection>
<collection name="flags" src="buttons.png"> <collection name="flags" src="buttons.png">
<image name="Allies" x="0" y="56" width="30" height="25" /> <image name="Allies" x="0" y="56" width="30" height="15" />
<image name="Soviet" x="0" y="56" width="30" height="25" /> <image name="Soviet" x="0" y="56" width="30" height="15" />
<image name="Random" x="0" y="56" width="30" height="25" /> <image name="Random" x="0" y="56" width="30" height="15" />
</collection> </collection>
</chrome> </chrome>

82
mods/ra/menus.yaml
View File

@@ -339,34 +339,34 @@ Container:
Height:PARENT_BOTTOM-12 Height:PARENT_BOTTOM-12
Button@FACTION: Button@FACTION:
Id:FACTION Id:FACTION
Text:Faction Width:100
Width:60
Height:25 Height:25
X:180 X:180
Y:0 Y:0
Image@FACTIONFLAG: Children:
Id:FACTIONFLAG Image@FACTIONFLAG:
Width:30 Id:FACTIONFLAG
Height:25 Width:30
X:235 Height:15
Y:0 X:1
Button@SPAWN: Y:5
Id:SPAWN Label@FACTIONNAME:
Text:Spawn Id:FACTIONNAME
Width:70 Text:Faction
Height:25 Width:60
X:275 Height:25
Y:0 X:35
Y:5
Button@TEAM: Button@TEAM:
Id:TEAM Id:TEAM
Text:Team Text:Team
Width:70 Width:70
Height:25 Height:25
X:355 X:295
Y:0 Y:0
Checkbox@STATUS: Checkbox@STATUS:
Id:STATUS Id:STATUS
X:455 X:380
Y:1 Y:1
Width:20 Width:20
Height:20 Height:20
@@ -393,37 +393,35 @@ Container:
Height:13 Height:13
Label@FACTION: Label@FACTION:
Id:FACTION Id:FACTION
Text:Faction Width:100
Width:60
Height:25 Height:25
X:180 X:180
Y:0 Y:0
Align:Center Children:
Image@FACTIONFLAG: Image@FACTIONFLAG:
Id:FACTIONFLAG Id:FACTIONFLAG
Width:30 Width:30
Height:25 Height:15
X:235 X:1
Y:0 Y:5
Label@SPAWN: Label@FACTIONNAME:
Id:SPAWN Id:FACTIONNAME
Text:Spawn Text:Faction
Width:70 Width:60
Height:25 Height:25
X:275 X:35
Y:0 Y:5
Align:Center
Label@TEAM: Label@TEAM:
Id:TEAM Id:TEAM
Text:Team Text:Team
Width:70 Width:70
Height:25 Height:25
X:355 X:295
Y:0 Y:0
Align:Center Align:Center
Checkbox@STATUS: Checkbox@STATUS:
Id:STATUS Id:STATUS
X:455 X:380
Y:1 Y:1
Width:20 Width:20
Height:20 Height:20
@@ -454,25 +452,17 @@ Container:
Y:0 Y:0
Text:Faction Text:Faction
Align:Center Align:Center
Label@LABEL_LOBBY_SPAWN:
Id:LABEL_LOBBY_SPAWN
Width:70
Height:25
X:275
Y:0
Text:Spawn
Align:Center
Label@LABEL_LOBBY_TEAM: Label@LABEL_LOBBY_TEAM:
Id:LABEL_LOBBY_TEAM Id:LABEL_LOBBY_TEAM
Width:70 Width:70
Height:25 Height:25
X:355 X:295
Y:0 Y:0
Text:Team Text:Team
Align:Center Align:Center
Label@LABEL_LOBBY_STATUS: Label@LABEL_LOBBY_STATUS:
Id:LABEL_LOBBY_STATUS Id:LABEL_LOBBY_STATUS
X:455 X:380
Y:0 Y:0
Width:20 Width:20
Height:20 Height:20