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

Updated production spec widget to handle overflow

Browse Source
This commit is contained in:
teinarss
2019-06-22 11:57:18 +02:00
committed by abcdefg30
parent b81ede2d64
commit 7e3830e053
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Common/Widgets/ObserverProductionIconsWidget.cs
View File

@@ -47,6 +47,7 @@ namespace OpenRA.Mods.Common.Widgets
float2 iconSize; float2 iconSize;
int lastIconIdx; int lastIconIdx;
public int MinWidth = 240;
[ObjectCreator.UseCtor] [ObjectCreator.UseCtor]
public ObserverProductionIconsWidget(World world, WorldRenderer worldRenderer) public ObserverProductionIconsWidget(World world, WorldRenderer worldRenderer)
@@ -82,6 +83,8 @@ namespace OpenRA.Mods.Common.Widgets
TooltipIcon = other.TooltipIcon; TooltipIcon = other.TooltipIcon;
GetTooltipIcon = () => TooltipIcon; GetTooltipIcon = () => TooltipIcon;
MinWidth = other.MinWidth;
TooltipTemplate = other.TooltipTemplate; TooltipTemplate = other.TooltipTemplate;
TooltipContainer = other.TooltipContainer; TooltipContainer = other.TooltipContainer;
@@ -114,7 +117,7 @@ namespace OpenRA.Mods.Common.Widgets
.ThenBy(g => g.First().BuildPaletteOrder) .ThenBy(g => g.First().BuildPaletteOrder)
.ToList(); .ToList();
Bounds.Width = currentItemsByItem.Count * (IconWidth + IconSpacing); Bounds.Width = Math.Max(currentItemsByItem.Count * (IconWidth + IconSpacing), MinWidth);
Game.Renderer.EnableAntialiasingFilter(); Game.Renderer.EnableAntialiasingFilter();
@@ -193,6 +196,19 @@ namespace OpenRA.Mods.Common.Widgets
Color.White, Color.Black, 1); Color.White, Color.Black, 1);
} }
} }
var parentWidth = Bounds.X + Bounds.Width;
Parent.Bounds.Width = parentWidth;
var gradient = Parent.Get<GradientColorBlockWidget>("PLAYER_GRADIENT");
var offset = gradient.Bounds.X - Bounds.X;
var gradientWidth = Math.Max(MinWidth - offset, currentItemsByItem.Count * (IconWidth + IconSpacing));
gradient.Bounds.Width = gradientWidth;
var widestChildWidth = Parent.Parent.Children.Max(x => x.Bounds.Width);
Parent.Parent.Bounds.Width = Math.Max(25 + widestChildWidth, Bounds.Left + MinWidth);
} }
static string GetOverlayForItem(ProductionItem item, int timestep) static string GetOverlayForItem(ProductionItem item, int timestep)