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

some cleanup

Browse Source
This commit is contained in:
Chris Forbes
2010-04-15 19:15:50 +12:00
parent 006c87bd1c
commit bc35249543
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Widgets/MoneyBinWidget.cs
View File

@@ -82,30 +82,26 @@ namespace OpenRA.Widgets
br.Y += u.Y; br.Y += u.Y;
br += new int2(-15, 25); br += new int2(-15, 25);
var images = new[] { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" }; var border = WidgetUtils.GetBorderSizes("dialog4");
var ss = images.Select(i => ChromeProvider.GetImage(Game.chrome.renderer, "dialog4", i)).ToArray();
WidgetUtils.DrawPanelPartial("dialog4", rect WidgetUtils.DrawPanelPartial("dialog4", rect
.InflateBy(0, 0, 0, (int)ss[1].size.Y), .InflateBy(0, 0, 0, border[1]),
PanelSides.Top | PanelSides.Left | PanelSides.Right); PanelSides.Top | PanelSides.Left | PanelSides.Right);
WidgetUtils.DrawPanelPartial("dialog4", new Rectangle(br.X, m.Y, pos.X - br.X, br.Y - m.Y) WidgetUtils.DrawPanelPartial("dialog4", new Rectangle(br.X, m.Y, pos.X - br.X, br.Y - m.Y)
.InflateBy(0, 0, (int)ss[3].size.X, 0), .InflateBy(0, 0, border[3], 0),
PanelSides.Top | PanelSides.Left | PanelSides.Bottom); PanelSides.Top | PanelSides.Left | PanelSides.Bottom);
WidgetUtils.DrawPanelPartial("dialog4", new Rectangle(pos.X, m.Y, m.X - pos.X, br.Y - m.Y) WidgetUtils.DrawPanelPartial("dialog4", new Rectangle(pos.X, m.Y, m.X - pos.X, br.Y - m.Y)
.InflateBy((int)ss[2].size.X, (int)ss[0].size.Y, 0, 0), .InflateBy(border[2], border[0], 0, 0),
PanelSides.Right | PanelSides.Bottom); PanelSides.Right | PanelSides.Bottom);
pos.X = br.X + 8; pos.X = br.X + 8;
pos.Y = m.Y + 8; pos.Y = m.Y + 8;
Game.chrome.renderer.BoldFont.DrawText(cb.Description, pos, Color.White); Game.chrome.renderer.BoldFont.DrawText(cb.Description, pos, Color.White);
if (cb.LongDesc != null) pos += new int2(0, 20);
{ Game.chrome.renderer.RegularFont.DrawText(cb.LongDesc.Replace("\\n", "\n"), pos, Color.White);
pos += new int2(0, 20);
Game.chrome.renderer.RegularFont.DrawText(cb.LongDesc.Replace("\\n", "\n"), pos, Color.White);
}
} }
Game.chrome.renderer.RgbaSpriteRenderer.DrawSprite(image, origin, "chrome"); Game.chrome.renderer.RgbaSpriteRenderer.DrawSprite(image, origin, "chrome");

7
OpenRA.Game/Widgets/WidgetUtils.cs
View File

@@ -63,6 +63,13 @@ namespace OpenRA.Widgets
DrawRGBA(ss, new float2(x, y)); DrawRGBA(ss, new float2(x, y));
} }
} }
public static int[] GetBorderSizes(string collection)
{
var images = new[] { "border-t", "border-b", "border-l", "border-r" };
var ss = images.Select(i => ChromeProvider.GetImage(Game.chrome.renderer, "dialog4", i)).ToArray();
return new[] { (int)ss[0].size.Y, (int)ss[1].size.Y, (int)ss[2].size.X, (int)ss[3].size.X };
}
// todo: write this in terms of 3 DrawPanelPartial calls // todo: write this in terms of 3 DrawPanelPartial calls
public static void DrawRightTooltip(string collection, int2 tl, int2 m, int2 br, Action a) public static void DrawRightTooltip(string collection, int2 tl, int2 m, int2 br, Action a)