Merge pull request #6527 from pchote/revert-6518

Revert "Polishing/normalizing new GUI"
This commit is contained in:
Taryn Hill
2014-09-20 20:27:10 -05:00
3 changed files with 0 additions and 2 deletions

View File

@@ -21,7 +21,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var powerManager = world.LocalPlayer.PlayerActor.Trait<PowerManager>();
var power = widget.Get<LabelWithTooltipWidget>("POWER");
power.GetColor = () => powerManager.ExcessPower < 0 ? System.Drawing.Color.Red : System.Drawing.Color.White;
power.GetText = () => powerManager.PowerProvided == 1000000 ? "inf" : powerManager.ExcessPower.ToString();
power.GetTooltipText = () => "Power Usage: " + powerManager.PowerDrained.ToString() + (powerManager.PowerProvided != 1000000 ? "/" + powerManager.PowerProvided.ToString() : "");
}

View File

@@ -164,7 +164,6 @@ Container@PLAYER_WIDGETS:
Children:
Label@GAME_TIMER:
Logic: GameTimerLogic
X: 3
Y: 263
Width: PARENT_RIGHT
Height: 22

Binary file not shown.

Before

Width:  |  Height:  |  Size: 103 KiB

After

Width:  |  Height:  |  Size: 107 KiB