remove PowerBarWidget entirely

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -107,7 +107,6 @@
     <Compile Include="Widgets\Logic\SimpleTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\WorldTooltipLogic.cs" />
-    <Compile Include="Widgets\PowerBarWidget.cs" />
     <Compile Include="Widgets\ProductionPaletteWidget.cs" />
     <Compile Include="Widgets\ProductionTabsWidget.cs" />
     <Compile Include="Widgets\SupportPowersWidget.cs" />

OpenRA.Mods.Cnc/Widgets/Logic/CncIngameChromeLogic.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Drawing;
 using OpenRA.Mods.RA.Orders;
+using OpenRA.Mods.RA.Buildings;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
@@ -114,6 +115,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 			BindOrderButton<SellOrderGenerator>(world, sidebarRoot, "SELL_BUTTON", "sell");
 			BindOrderButton<RepairOrderGenerator>(world, sidebarRoot, "REPAIR_BUTTON", "repair");
 
+			var powerManager = world.LocalPlayer.PlayerActor.Trait<PowerManager>();
 			var playerResources = world.LocalPlayer.PlayerActor.Trait<PlayerResources>();
 			sidebarRoot.Get<LabelWidget>("CASH").GetText = () =>
 				"${0}".F(playerResources.DisplayCash + playerResources.DisplayOre);
@@ -164,6 +166,18 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic
 				if (playerResources.Ore >= 0.8 * playerResources.OreCapacity) return Color.Orange;
 				return Color.LimeGreen;
 			};
+
+			var powerBar = playerWidgets.Get<ResourceBarWidget>("POWERBAR");
+			powerBar.GetProvided = () => powerManager.PowerProvided;
+			powerBar.GetUsed = () => powerManager.PowerDrained;
+			powerBar.TooltipFormat = "Power Usage: {0}/{1}";
+			powerBar.RightIndicator = false;
+			powerBar.GetBarColor = () => 
+			{
+				if (powerManager.PowerState == PowerState.Critical) return Color.Red;
+				if (powerManager.PowerState == PowerState.Low) return Color.Orange;
+				return Color.LimeGreen;
+			};
 		}
 
 		static void BindOrderButton<T>(World world, Widget parent, string button, string icon)

OpenRA.Mods.Cnc/Widgets/PowerBarWidget.cs

@@ -1,87 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see COPYING.
- */
-#endregion
-
-using System;
-using System.Drawing;
-using OpenRA.FileFormats;
-using OpenRA.Graphics;
-using OpenRA.Mods.RA.Buildings;
-using OpenRA.Widgets;
-
-namespace OpenRA.Mods.Cnc.Widgets
-{
-	public class PowerBarWidget : Widget
-	{
-		public readonly string TooltipTemplate = "SIMPLE_TOOLTIP";
-		public readonly string TooltipContainer;
-		Lazy<TooltipContainerWidget> tooltipContainer;
-
-		float? lastProvidedFrac;
-		float? lastDrainedFrac;
-		readonly PowerManager pm;
-
-		[ObjectCreator.UseCtor]
-		public PowerBarWidget(World world)
-		{
-			pm = world.LocalPlayer.PlayerActor.Trait<PowerManager>();
-			tooltipContainer = Lazy.New(() =>
-				Ui.Root.Get<TooltipContainerWidget>(TooltipContainer));
-		}
-
-		public override void MouseEntered()
-		{
-			if (TooltipContainer == null) return;
-			Func<string> getText = () => "Power Usage: {0}/{1}".F(pm.PowerDrained, pm.PowerProvided);
-			tooltipContainer.Value.SetTooltip(TooltipTemplate, new WidgetArgs() {{ "getText", getText }});
-		}
-
-		public override void MouseExited()
-		{
-			if (TooltipContainer == null) return;
-			tooltipContainer.Value.RemoveTooltip();
-		}
-
-		public override void Draw()
-		{
-			float powerScaleBy = 100;
-			var maxPower = Math.Max(pm.PowerProvided, pm.PowerDrained);
-			while (maxPower >= powerScaleBy) powerScaleBy *= 2;
-			var animRate = .3f;
-
-			// Current power supply
-			var providedFrac = pm.PowerProvided / powerScaleBy;
-			lastProvidedFrac = providedFrac = float2.Lerp(lastProvidedFrac.GetValueOrDefault(providedFrac), providedFrac, animRate);
-
-			var color = GetBarColor();
-
-			var b = RenderBounds;
-			var rect = new RectangleF(b.X, float2.Lerp(b.Bottom, b.Top, providedFrac),
-				(float)b.Width, providedFrac*b.Height);
-			Game.Renderer.LineRenderer.FillRect(rect, color);
-
-			var indicator = ChromeProvider.GetImage("sidebar-bits", "left-indicator");
-
-			var drainedFrac = pm.PowerDrained / powerScaleBy;
-			lastDrainedFrac = drainedFrac = float2.Lerp(lastDrainedFrac.GetValueOrDefault(drainedFrac), drainedFrac, animRate);
-
-			float2 pos = new float2(b.X + b.Width - indicator.size.X,
-				float2.Lerp(b.Bottom, b.Top, drainedFrac));
-
-			Game.Renderer.RgbaSpriteRenderer.DrawSprite(indicator, pos);
-		}
-
-		Color GetBarColor()
-		{
-			if (pm.PowerState == PowerState.Critical) return Color.Red;
-			if (pm.PowerState == PowerState.Low) return Color.Orange;
-			return Color.LimeGreen;
-		}
-	}
-}

mods/cnc/chrome/ingame.yaml

@@ -150,14 +150,14 @@ Container@PLAYER_WIDGETS:
 							Width:PARENT_RIGHT-2
 							Height:PARENT_BOTTOM-2
 							WorldInteractionController:INTERACTION_CONTROLLER
-				Background@POWERBAR:
+				Background@POWERBAR_PANEL:
 					X:4
 					Y:5
 					Width:10
 					Height:168
 					Background:panel-black
 					Children:
-						PowerBar:
+						ResourceBar@POWERBAR:
 							X:1
 							Y:1
 							Width:PARENT_RIGHT-2