From 10decf25448f387a109c9f67cea2fd7399d2c621 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 20 Mar 2010 12:13:16 +1300 Subject: [PATCH] removed a pile of duplication; checkboxes work properly in both games now. --- OpenRA.Game/Chrome.cs | 2 +- OpenRA.Game/Chrome/BackgroundWidget.cs | 81 +++++++++++++++----------- OpenRA.Game/Chrome/ButtonWidget.cs | 63 ++++++-------------- OpenRA.Game/Chrome/CheckboxWidget.cs | 48 +++++---------- 4 files changed, 82 insertions(+), 112 deletions(-) diff --git a/OpenRA.Game/Chrome.cs b/OpenRA.Game/Chrome.cs index cf19624b5d..9a3033ffcf 100644 --- a/OpenRA.Game/Chrome.cs +++ b/OpenRA.Game/Chrome.cs @@ -36,7 +36,7 @@ namespace OpenRA { public readonly Renderer renderer; public readonly SpriteRenderer rgbaRenderer; - readonly LineRenderer lineRenderer; + public readonly LineRenderer lineRenderer; readonly SpriteRenderer shpRenderer; string chromeCollection; diff --git a/OpenRA.Game/Chrome/BackgroundWidget.cs b/OpenRA.Game/Chrome/BackgroundWidget.cs index 35dff566be..dc8fe3532d 100644 --- a/OpenRA.Game/Chrome/BackgroundWidget.cs +++ b/OpenRA.Game/Chrome/BackgroundWidget.cs @@ -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(); + } } } \ No newline at end of file diff --git a/OpenRA.Game/Chrome/ButtonWidget.cs b/OpenRA.Game/Chrome/ButtonWidget.cs index 8a20eaed75..c9fc2d5dd5 100644 --- a/OpenRA.Game/Chrome/ButtonWidget.cs +++ b/OpenRA.Game/Chrome/ButtonWidget.cs @@ -60,51 +60,24 @@ namespace OpenRA.Widgets } return false; - } - - public override void Draw() - { - if (!Visible) - { - base.Draw(); - return; - } - - string collection = (Depressed) ? "dialog3" : "dialog2"; - int2 stateOffset = (Depressed) ? new int2(VisualHeight,VisualHeight) : new int2(0,0); - 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.BoldFont.DrawText(Game.chrome.rgbaRenderer, Text, new int2(Bounds.X+Bounds.Width/2, Bounds.Y+Bounds.Height/2) - new int2(Game.chrome.renderer.BoldFont.Measure(Text).X / 2, Game.chrome.renderer.BoldFont.Measure(Text).Y/2) + stateOffset, Color.White); - - Game.chrome.renderer.Device.DisableScissor(); - - base.Draw(); + } + + public override void Draw() + { + if (!Visible) + { + base.Draw(); + return; + } + + var stateOffset = (Depressed) ? new int2(VisualHeight, VisualHeight) : new int2(0, 0); + WidgetUtils.DrawPanel(Depressed ? "dialog3" : "dialog2", Bounds, + () => Game.chrome.renderer.BoldFont.DrawText(Game.chrome.rgbaRenderer, Text, + new int2(Bounds.X + Bounds.Width / 2, Bounds.Y + Bounds.Height / 2) + - new int2(Game.chrome.renderer.BoldFont.Measure(Text).X / 2, + Game.chrome.renderer.BoldFont.Measure(Text).Y / 2) + stateOffset, Color.White)); + + base.Draw(); } } } \ No newline at end of file diff --git a/OpenRA.Game/Chrome/CheckboxWidget.cs b/OpenRA.Game/Chrome/CheckboxWidget.cs index a74a63d394..d210543d1c 100644 --- a/OpenRA.Game/Chrome/CheckboxWidget.cs +++ b/OpenRA.Game/Chrome/CheckboxWidget.cs @@ -19,6 +19,7 @@ #endregion using OpenRA.Graphics; +using System.Drawing; namespace OpenRA.Widgets { @@ -31,39 +32,22 @@ namespace OpenRA.Widgets base.Draw(); return; } - bool selected = false; - if (InputHandler.Value != null) - selected = InputHandler.Value.GetState(this); - - string collection = (selected) ? "dialog3" : "dialog2"; - - 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"); + + var selected = InputHandler.Value != null ? InputHandler.Value.GetState(this) : false; + + WidgetUtils.DrawPanel("dialog3", Bounds, () => { }); + + if (selected) + { + Game.chrome.lineRenderer.FillRect( + new RectangleF( + Game.viewport.Location.X + Bounds.Left + 4, + Game.viewport.Location.Y + Bounds.Top + 5, + Bounds.Width - 9, + Bounds.Height - 9), + Color.White); + Game.chrome.lineRenderer.Flush(); } - - 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(); base.Draw(); }