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

Implemented horizontal allign support for SupportPowersWidget

Browse Source
This commit is contained in:
Unknown
2018-08-04 16:53:26 +02:00
committed by reaperrr
parent e179a9529e
commit c97f36793c
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Mods.Common/Widgets/Logic/Ingame/SupportPowerBinLogic.cs
View File

@@ -37,6 +37,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
Action<int, int> updateBackground = (_, icons) => Action<int, int> updateBackground = (_, icons) =>
{ {
var rowHeight = palette.IconSize.Y + palette.IconMargin; var rowHeight = palette.IconSize.Y + palette.IconMargin;
var rowWidth = palette.IconSize.X + palette.IconMargin;
if (background != null) if (background != null)
{ {
@@ -45,7 +46,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
for (var i = 0; i < icons; i++) for (var i = 0; i < icons; i++)
{ {
var row = backgroundTemplate.Clone(); var row = backgroundTemplate.Clone();
row.Bounds.Y += i * rowHeight; if (palette.Horizontal)
row.Bounds.X += i * rowWidth;
else
row.Bounds.Y += i * rowHeight;
background.AddChild(row); background.AddChild(row);
} }
} }
@@ -57,7 +61,10 @@ namespace OpenRA.Mods.Common.Widgets.Logic
for (var i = 0; i < icons; i++) for (var i = 0; i < icons; i++)
{ {
var row = foregroundTemplate.Clone(); var row = foregroundTemplate.Clone();
row.Bounds.Y += i * rowHeight; if (palette.Horizontal)
row.Bounds.X += i * rowWidth;
else
row.Bounds.Y += i * rowHeight;
foreground.AddChild(row); foreground.AddChild(row);
} }
} }

9
OpenRA.Mods.Common/Widgets/SupportPowersWidget.cs
View File

@@ -40,6 +40,8 @@ namespace OpenRA.Mods.Common.Widgets
public readonly string ClockSequence = "idle"; public readonly string ClockSequence = "idle";
public readonly string ClockPalette = "chrome"; public readonly string ClockPalette = "chrome";
public readonly bool Horizontal = false;
public int IconCount { get; private set; } public int IconCount { get; private set; }
public event Action<int, int> OnIconCountChanged = (a, b) => { }; public event Action<int, int> OnIconCountChanged = (a, b) => { };
@@ -124,7 +126,12 @@ namespace OpenRA.Mods.Common.Widgets
var rb = RenderBounds; var rb = RenderBounds;
foreach (var p in powers) foreach (var p in powers)
{ {
var rect = new Rectangle(rb.X, rb.Y + IconCount * (IconSize.Y + IconMargin), IconSize.X, IconSize.Y); Rectangle rect;
if (Horizontal)
rect = new Rectangle(rb.X + IconCount * (IconSize.X + IconMargin), rb.Y, IconSize.X, IconSize.Y);
else
rect = new Rectangle(rb.X, rb.Y + IconCount * (IconSize.Y + IconMargin), IconSize.X, IconSize.Y);
icon.Play(p.Info.Icon); icon.Play(p.Info.Icon);
var power = new SupportPowerIcon() var power = new SupportPowerIcon()