diff --git a/BizHawk.MultiClient/Config.cs b/BizHawk.MultiClient/Config.cs index 97e7df35bf..0874d232e4 100644 --- a/BizHawk.MultiClient/Config.cs +++ b/BizHawk.MultiClient/Config.cs @@ -1,4 +1,5 @@ using System.IO; +using System.Drawing; namespace BizHawk.MultiClient { @@ -280,9 +281,12 @@ namespace BizHawk.MultiClient public int HexEditorDataSize = 1; //Hex Editor Colors public bool hexcustom; - public System.Drawing.Color hexbackgrnd; - public System.Drawing.Color hexforegrnd; - public System.Drawing.Color hexmenubar; + public Color HexBackgrndColor; + public Color HexForegrndColor; + public Color HexMenubarColor; + public Color HexFreezeColor = Color.LightBlue; + public Color HexHighlightColor = Color.Pink; + public Color HexHighlightFreezeColor = Color.Violet; // Video dumping settings public int JMDCompression = 3; diff --git a/BizHawk.MultiClient/tools/HexColor.cs b/BizHawk.MultiClient/tools/HexColor.cs index e516f51420..79594857b0 100644 --- a/BizHawk.MultiClient/tools/HexColor.cs +++ b/BizHawk.MultiClient/tools/HexColor.cs @@ -18,17 +18,17 @@ namespace BizHawk.MultiClient private void HexColors_Form_Load(object sender, EventArgs e) { - HexBackgrnd.BackColor = Global.Config.hexbackgrnd; - HexForegrnd.BackColor = Global.Config.hexforegrnd; - HexMenubar.BackColor = Global.Config.hexmenubar; + HexBackgrnd.BackColor = Global.Config.HexBackgrndColor; + HexForegrnd.BackColor = Global.Config.HexForegrndColor; + HexMenubar.BackColor = Global.Config.HexMenubarColor; } private void HexBackgrnd_Click(Object sender, MouseEventArgs e) { if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - Global.Config.hexbackgrnd = colorDialog1.Color; - Global.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.hexbackgrnd; + Global.Config.HexBackgrndColor = colorDialog1.Color; + Global.MainForm.HexEditor1.MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor; this.HexBackgrnd.BackColor = colorDialog1.Color; } } @@ -37,8 +37,8 @@ namespace BizHawk.MultiClient { if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - Global.Config.hexforegrnd = colorDialog1.Color; - Global.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.hexforegrnd; + Global.Config.HexForegrndColor = colorDialog1.Color; + Global.MainForm.HexEditor1.MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor; this.HexForegrnd.BackColor = colorDialog1.Color; } @@ -48,8 +48,8 @@ namespace BizHawk.MultiClient { if (colorDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - Global.Config.hexmenubar = colorDialog1.Color; - Global.MainForm.HexEditor1.menuStrip1.BackColor = Global.Config.hexmenubar; + Global.Config.HexMenubarColor = colorDialog1.Color; + Global.MainForm.HexEditor1.menuStrip1.BackColor = Global.Config.HexMenubarColor; this.HexMenubar.BackColor = colorDialog1.Color; } } diff --git a/BizHawk.MultiClient/tools/HexEditor.Designer.cs b/BizHawk.MultiClient/tools/HexEditor.Designer.cs index e8cc3477f1..94a0198069 100644 --- a/BizHawk.MultiClient/tools/HexEditor.Designer.cs +++ b/BizHawk.MultiClient/tools/HexEditor.Designer.cs @@ -362,7 +362,6 @@ this.resetToDefaultToolStripMenuItem.Name = "resetToDefaultToolStripMenuItem"; this.resetToDefaultToolStripMenuItem.Size = new System.Drawing.Size(157, 22); this.resetToDefaultToolStripMenuItem.Text = "Reset to Default"; - this.resetToDefaultToolStripMenuItem.Click += new System.EventHandler(this.resetToDefaultToolStripMenuItem_Click); // // ViewerContextMenuStrip // diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index ccd19cc8fc..5af4b9e67b 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -107,15 +107,15 @@ namespace BizHawk.MultiClient if (Global.Config.hexcustom) { - menuStrip1.BackColor = Global.Config.hexmenubar; - MemoryViewerBox.BackColor = Global.Config.hexbackgrnd; - MemoryViewerBox.ForeColor = Global.Config.hexforegrnd; + menuStrip1.BackColor = Global.Config.HexMenubarColor; + MemoryViewerBox.BackColor = Global.Config.HexBackgrndColor; + MemoryViewerBox.ForeColor = Global.Config.HexForegrndColor; } else { - Global.Config.hexmenubar = this.menuStrip1.BackColor; - Global.Config.hexbackgrnd = this.MemoryViewerBox.BackColor; - Global.Config.hexforegrnd = this.AddressesLabel.ForeColor; + Global.Config.HexMenubarColor = this.menuStrip1.BackColor; + Global.Config.HexBackgrndColor = this.MemoryViewerBox.BackColor; + Global.Config.HexForegrndColor = this.AddressesLabel.ForeColor; Global.Config.hexcustom = true; } @@ -965,6 +965,7 @@ namespace BizHawk.MultiClient private void MemoryViewerBox_Paint(object sender, PaintEventArgs e) { + for (int x = 0; x < Global.CheatList.Count; x++) { if (IsVisible(Global.CheatList.cheatList[x].address)) @@ -973,7 +974,7 @@ namespace BizHawk.MultiClient { Rectangle rect = new Rectangle(GetAddressCoordinates(Global.CheatList.cheatList[x].address), new Size(15 * DataSize, fontHeight)); e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect); - e.Graphics.FillRectangle(Brushes.LightBlue, rect); + e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexFreezeColor), rect); } } } @@ -982,9 +983,9 @@ namespace BizHawk.MultiClient Rectangle rect = new Rectangle(GetAddressCoordinates(addressHighlighted), new Size(15 * DataSize, fontHeight)); e.Graphics.DrawRectangle(new Pen(Brushes.Black), rect); if (Global.CheatList.IsActiveCheat(Domain, addressHighlighted)) - e.Graphics.FillRectangle(Brushes.Violet, rect); + e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightFreezeColor), rect); else - e.Graphics.FillRectangle(Brushes.Pink, rect); + e.Graphics.FillRectangle(new SolidBrush(Global.Config.HexHighlightColor), rect); } if (HasNibbles()) { @@ -1460,16 +1461,6 @@ namespace BizHawk.MultiClient SaveAsBinary(); } - private void resetToDefaultToolStripMenuItem_Click(object sender, EventArgs e) - { - Global.Config.hexbackgrnd = Color.FromName("Control"); - Global.Config.hexforegrnd = Color.FromName("ControlText"); - Global.Config.hexmenubar = Color.FromName("Control"); - MemoryViewerBox.BackColor = Global.Config.hexbackgrnd; - MemoryViewerBox.ForeColor = Global.Config.hexforegrnd; - menuStrip1.BackColor = Global.Config.hexmenubar; - } - private void setColorsToolStripMenuItem_Click(object sender, EventArgs e) { HexColors_Form h = new HexColors_Form(); @@ -1485,11 +1476,11 @@ namespace BizHawk.MultiClient private void resetToDefaultToolStripMenuItem1_Click(object sender, EventArgs e) { this.MemoryViewerBox.BackColor = Color.FromName("Control"); - Global.Config.hexbackgrnd = Color.FromName("Control"); + Global.Config.HexBackgrndColor = Color.FromName("Control"); this.MemoryViewerBox.ForeColor = Color.FromName("ControlText"); - Global.Config.hexforegrnd = Color.FromName("ControlText"); + Global.Config.HexForegrndColor = Color.FromName("ControlText"); this.menuStrip1.BackColor = Color.FromName("Control"); - Global.Config.hexmenubar = Color.FromName("Control"); + Global.Config.HexMenubarColor = Color.FromName("Control"); } } } \ No newline at end of file