From bf2cad8b15b79e8df211fbe3c04c022a7ec5cb51 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Mon, 22 Aug 2011 16:42:32 +0000 Subject: [PATCH] Hex Editor - more restoring of commented code from the removal of MemoryViewer --- BizHawk.MultiClient/tools/HexEditor.cs | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs index 54552a2bcc..af4b5e03ed 100644 --- a/BizHawk.MultiClient/tools/HexEditor.cs +++ b/BizHawk.MultiClient/tools/HexEditor.cs @@ -98,7 +98,7 @@ namespace BizHawk.MultiClient AddressesLabel.Text = GenerateMemoryViewString(); } - private string GenerateMemoryViewString() + public string GenerateMemoryViewString() { unchecked { @@ -107,9 +107,7 @@ namespace BizHawk.MultiClient StringBuilder rowStr = new StringBuilder(""); addrOffset = (NumDigits % 4) * 9; - - - rowStr.Append(Domain.Name + " " + info + '\n'); + rowStr.Append(Header + '\n'); for (int i = 0; i < RowsVisible; i++) @@ -375,7 +373,7 @@ namespace BizHawk.MultiClient SetHighlighted(address); ClearNibbles(); - //Refresh(); + UpdateValues(); //TODO: Groupbox refresh } public void SetHighlighted(int addr) @@ -390,7 +388,7 @@ namespace BizHawk.MultiClient int v = (addr / 16) - RowsVisible + 1; if (v < 0) v = 0; - //vScrollBar1.Value = v; + vScrollBar1.Value = v; } addressHighlighted = addr; addressOver = addr; @@ -404,10 +402,10 @@ namespace BizHawk.MultiClient { int row = addr >> 4; - //if (row >= vScrollBar1.Value && row < (RowsVisible + vScrollBar1.Value)) + if (row >= vScrollBar1.Value && row < (RowsVisible + vScrollBar1.Value)) return true; - //else - // return false; + else + return false; } } @@ -462,11 +460,6 @@ namespace BizHawk.MultiClient BigEndian ^= true; } - private void MemoryViewer_Paint(object sender, PaintEventArgs e) - { - - } - private void AddToRamWatch() { //Add to RAM Watch @@ -608,7 +601,7 @@ namespace BizHawk.MultiClient break; } - //w.bigendian = MemoryViewer.BigEndian; + w.bigendian = BigEndian; Global.MainForm.Cheats1.AddCheat(c); }