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

Fix support power tooltip time coloring.

Browse Source
This commit is contained in:
Paul Chote
2017-12-17 13:49:12 +00:00
committed by abcdefg30
parent 77ef13816f
commit c269525397
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerTooltipLogic.cs
View File

@@ -19,7 +19,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public class SupportPowerTooltipLogic : ChromeLogic public class SupportPowerTooltipLogic : ChromeLogic
{ {
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public SupportPowerTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, Player player, SupportPowersWidget palette, World world) public SupportPowerTooltipLogic(Widget widget, TooltipContainerWidget tooltipContainer, SupportPowersWidget palette, World world)
{ {
widget.IsVisible = () => palette.TooltipIcon != null && palette.TooltipIcon.Power.Info != null; widget.IsVisible = () => palette.TooltipIcon != null && palette.TooltipIcon.Power.Info != null;
var nameLabel = widget.Get<LabelWidget>("NAME"); var nameLabel = widget.Get<LabelWidget>("NAME");
@@ -32,7 +32,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var descFont = Game.Renderer.Fonts[descLabel.Font]; var descFont = Game.Renderer.Fonts[descLabel.Font];
var baseHeight = widget.Bounds.Height; var baseHeight = widget.Bounds.Height;
var timeOffset = timeLabel.Bounds.X; var timeOffset = timeLabel.Bounds.X;
var pm = player.PlayerActor.Trait<PowerManager>();
SupportPowerInstance lastPower = null; SupportPowerInstance lastPower = null;
Hotkey lastHotkey = Hotkey.Invalid; Hotkey lastHotkey = Hotkey.Invalid;
@@ -87,7 +86,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
lastRemainingSeconds = remainingSeconds; lastRemainingSeconds = remainingSeconds;
}; };
timeLabel.GetColor = () => pm.PowerState != PowerState.Normal ? Color.Red : Color.White; timeLabel.GetColor = () => palette.TooltipIcon != null && !palette.TooltipIcon.Power.Active
? Color.Red : Color.White;
} }
} }
} }