removed a pile of duplication; checkboxes work properly in both games now.
This commit is contained in:
@@ -18,7 +18,10 @@
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using System.Linq;
|
||||
using OpenRA.Graphics;
|
||||
using System.Drawing;
|
||||
using System;
|
||||
|
||||
namespace OpenRA.Widgets
|
||||
{
|
||||
@@ -30,41 +33,51 @@ namespace OpenRA.Widgets
|
||||
{
|
||||
base.Draw();
|
||||
return;
|
||||
}
|
||||
|
||||
string collection = "dialog";
|
||||
Game.chrome.renderer.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height);
|
||||
|
||||
string[] images = { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" };
|
||||
var ss = Graphics.Util.MakeArray(9, n => ChromeProvider.GetImage(Game.chrome.renderer, collection,images[n]));
|
||||
|
||||
for( var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X )
|
||||
for( var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y )
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[8], new float2(x, y), "chrome");
|
||||
|
||||
//draw borders
|
||||
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y)
|
||||
{
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[2], new float2(Bounds.Left, y), "chrome");
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome");
|
||||
}
|
||||
|
||||
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X)
|
||||
{
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome");
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome");
|
||||
}
|
||||
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome");
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome");
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome");
|
||||
Game.chrome.rgbaRenderer.DrawSprite(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y), "chrome");
|
||||
Game.chrome.rgbaRenderer.Flush();
|
||||
|
||||
Game.chrome.renderer.Device.DisableScissor();
|
||||
|
||||
|
||||
}
|
||||
|
||||
WidgetUtils.DrawPanel("dialog", Bounds, null);
|
||||
base.Draw();
|
||||
}
|
||||
}
|
||||
|
||||
static class WidgetUtils
|
||||
{
|
||||
public static void DrawPanel(string collection, Rectangle Bounds, Action a)
|
||||
{
|
||||
var r = Game.chrome.renderer;
|
||||
var sr = Game.chrome.rgbaRenderer;
|
||||
|
||||
r.Device.EnableScissor(Bounds.Left, Bounds.Top, Bounds.Width, Bounds.Height);
|
||||
|
||||
var images = new[] { "border-t", "border-b", "border-l", "border-r", "corner-tl", "corner-tr", "corner-bl", "corner-br", "background" };
|
||||
var ss = images.Select(i => ChromeProvider.GetImage(Game.chrome.renderer, collection, i)).ToArray();
|
||||
|
||||
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[8].size.X)
|
||||
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[8].size.Y)
|
||||
sr.DrawSprite(ss[8], new float2(x, y), "chrome");
|
||||
|
||||
//draw borders
|
||||
for (var y = Bounds.Top + (int)ss[0].size.Y; y < Bounds.Bottom - (int)ss[1].size.Y; y += (int)ss[2].size.Y)
|
||||
{
|
||||
sr.DrawSprite(ss[2], new float2(Bounds.Left, y), "chrome");
|
||||
sr.DrawSprite(ss[3], new float2(Bounds.Right - ss[3].size.X, y), "chrome");
|
||||
}
|
||||
|
||||
for (var x = Bounds.Left + (int)ss[2].size.X; x < Bounds.Right - (int)ss[3].size.X; x += (int)ss[0].size.X)
|
||||
{
|
||||
sr.DrawSprite(ss[0], new float2(x, Bounds.Top), "chrome");
|
||||
sr.DrawSprite(ss[1], new float2(x, Bounds.Bottom - ss[1].size.Y), "chrome");
|
||||
}
|
||||
|
||||
sr.DrawSprite(ss[4], new float2(Bounds.Left, Bounds.Top), "chrome");
|
||||
sr.DrawSprite(ss[5], new float2(Bounds.Right - ss[5].size.X, Bounds.Top), "chrome");
|
||||
sr.DrawSprite(ss[6], new float2(Bounds.Left, Bounds.Bottom - ss[6].size.Y), "chrome");
|
||||
sr.DrawSprite(ss[7], new float2(Bounds.Right - ss[7].size.X, Bounds.Bottom - ss[7].size.Y), "chrome");
|
||||
sr.Flush();
|
||||
|
||||
if (a != null) a();
|
||||
|
||||
r.Device.DisableScissor();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user