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

Cache offsets in ProductionPaletteWidget

Browse Source 
At least those that never change.
This commit is contained in:
reaperrr
2020-08-09 21:20:01 +02:00
committed by abcdefg30
parent cdc216aca0
commit c0f54fa4fc
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
View File

@@ -113,7 +113,7 @@ namespace OpenRA.Mods.Common.Widgets
readonly WorldRenderer worldRenderer; readonly WorldRenderer worldRenderer;
SpriteFont overlayFont, symbolFont; SpriteFont overlayFont, symbolFont;
float2 holdOffset, readyOffset, timeOffset, queuedOffset, infiniteOffset; float2 iconOffset, holdOffset, readyOffset, timeOffset, queuedOffset, infiniteOffset;
[CustomLintableHotkeyNames] [CustomLintableHotkeyNames]
public static IEnumerable<string> LinterHotkeyNames(MiniYamlNode widgetNode, Action<string> emitError, Action<string> emitWarning) public static IEnumerable<string> LinterHotkeyNames(MiniYamlNode widgetNode, Action<string> emitError, Action<string> emitWarning)
@@ -162,6 +162,16 @@ namespace OpenRA.Mods.Common.Widgets
overlayFont = Game.Renderer.Fonts[OverlayFont]; overlayFont = Game.Renderer.Fonts[OverlayFont];
Game.Renderer.Fonts.TryGetValue(SymbolsFont, out symbolFont); Game.Renderer.Fonts.TryGetValue(SymbolsFont, out symbolFont);
iconOffset = 0.5f * IconSize.ToFloat2() + IconSpriteOffset;
queuedOffset = new float2(4, 2);
holdOffset = iconOffset - overlayFont.Measure(HoldText) / 2;
readyOffset = iconOffset - overlayFont.Measure(ReadyText) / 2;
if (ChromeMetrics.TryGet("InfiniteOffset", out infiniteOffset))
infiniteOffset += queuedOffset;
else
infiniteOffset = queuedOffset;
} }
public void ScrollDown() public void ScrollDown()
@@ -463,17 +473,7 @@ namespace OpenRA.Mods.Common.Widgets
public override void Draw() public override void Draw()
{ {
var iconOffset = 0.5f * IconSize.ToFloat2() + IconSpriteOffset;
timeOffset = iconOffset - overlayFont.Measure(WidgetUtils.FormatTime(0, World.Timestep)) / 2; timeOffset = iconOffset - overlayFont.Measure(WidgetUtils.FormatTime(0, World.Timestep)) / 2;
queuedOffset = new float2(4, 2);
holdOffset = iconOffset - overlayFont.Measure(HoldText) / 2;
readyOffset = iconOffset - overlayFont.Measure(ReadyText) / 2;
if (ChromeMetrics.TryGet("InfiniteOffset", out infiniteOffset))
infiniteOffset += queuedOffset;
else
infiniteOffset = queuedOffset;
if (CurrentQueue == null) if (CurrentQueue == null)
return; return;