From 10a73f777d089c54d778678bdf623d4fcc94845b Mon Sep 17 00:00:00 2001 From: Rolanmen1 Date: Tue, 17 Apr 2012 16:12:14 +0000 Subject: [PATCH] gui.drawRectangle now accepts both hex and string. Hex format is ARGB (Alpha, Red, Green and Blue respectively). --- BizHawk.MultiClient/LuaImplementation.cs | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/BizHawk.MultiClient/LuaImplementation.cs b/BizHawk.MultiClient/LuaImplementation.cs index 6083e800e1..af132953e1 100644 --- a/BizHawk.MultiClient/LuaImplementation.cs +++ b/BizHawk.MultiClient/LuaImplementation.cs @@ -471,11 +471,27 @@ namespace BizHawk.MultiClient { try { - System.Drawing.Pen myPen = new System.Drawing.Pen(System.Drawing.Color.FromName(line.ToString().ToLower())); + System.Drawing.Pen myPen; + if(line.GetType() == typeof(Double)) + { + myPen = new System.Drawing.Pen(System.Drawing.Color.FromArgb(int.Parse(long.Parse(line.ToString()).ToString("X"), System.Globalization.NumberStyles.HexNumber))); + } + else + { + myPen = new System.Drawing.Pen(System.Drawing.Color.FromName(line.ToString().ToLower())); + } g.DrawRectangle(myPen, LuaInt(X), LuaInt(Y), LuaInt(width), LuaInt(height)); if (background != null) { - System.Drawing.SolidBrush myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.FromName(background.ToString().ToLower())); + System.Drawing.SolidBrush myBrush; + if (background.GetType() == typeof(Double)) + { + myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.FromArgb(int.Parse(long.Parse(background.ToString()).ToString("X"), System.Globalization.NumberStyles.HexNumber))); + } + else + { + myBrush = new System.Drawing.SolidBrush(System.Drawing.Color.FromName(background.ToString().ToLower())); + } g.FillRectangle(myBrush, LuaInt(X), LuaInt(Y), LuaInt(width), LuaInt(height)); }