From 8d7c745e56727aa51b2ea6db222dc84f95135591 Mon Sep 17 00:00:00 2001
From: "andres.delikat" <andres.delikat@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Thu, 25 Aug 2011 02:23:12 +0000
Subject: [PATCH] Show nibbles when hex editing, fix auto move to next address
 on 2 byte view, update values on load

---
 BizHawk.MultiClient/tools/HexEditor.cs | 35 +++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/BizHawk.MultiClient/tools/HexEditor.cs b/BizHawk.MultiClient/tools/HexEditor.cs
index 45bca4e12b..56363bfa69 100644
--- a/BizHawk.MultiClient/tools/HexEditor.cs
+++ b/BizHawk.MultiClient/tools/HexEditor.cs
@@ -34,7 +34,6 @@ namespace BizHawk.MultiClient
 		int addr = 0;
 		private int Pointedx = 0;
 		private int Pointedy = 0;
-
 		const int rowX = 1;
 		const int rowY = 4;
 		const int rowYoffset = 20;
@@ -47,7 +46,7 @@ namespace BizHawk.MultiClient
 			AddressesLabel.BackColor = Color.Transparent;
 			SetHeader();
 			Closing += (o, e) => SaveConfigSettings();
-			AddressesLabel.Font = new Font("Courier New", 8);
+			AddressesLabel.Font = new Font("Courier New", 8); ;
 		}
 
 		public void SaveConfigSettings()
@@ -76,6 +75,7 @@ namespace BizHawk.MultiClient
 				}
 			}
 			SetMemoryDomainMenu();
+			UpdateValues();
 		}
 
 		private void exitToolStripMenuItem_Click(object sender, EventArgs e)
@@ -790,6 +790,33 @@ namespace BizHawk.MultiClient
 				else
 					e.Graphics.FillRectangle(Brushes.Pink, rect);
 			}
+			if (HasNibbles())
+			{
+				e.Graphics.DrawString(MakeNibbles(), new Font("Courier New", 8, FontStyle.Italic), Brushes.Black, new Point(8,8));
+			}
+		}
+
+		private bool HasNibbles()
+		{
+			for (int x = 0; x < (Global.Config.HexEditorDataSize * 2); x++)
+			{
+				if (nibbles[x] != 'G')
+					return true;
+			}
+			return false;
+		}
+
+		private string MakeNibbles()
+		{
+			string str = "";
+			for (int x = 0; x < (Global.Config.HexEditorDataSize * 2); x++)
+			{
+				if (nibbles[x] != 'G')
+					str += nibbles[x];
+				else
+					break;
+			}
+			return str;
 		}
 
 		private void AddressesLabel_MouseLeave(object sender, EventArgs e)
@@ -847,7 +874,6 @@ namespace BizHawk.MultiClient
 				return;
 			}
 
-			//TODO: 4 byte
 			switch (Global.Config.HexEditorDataSize)
 			{
 				default:
@@ -893,7 +919,7 @@ namespace BizHawk.MultiClient
 						
 						PokeWord(addressHighlighted, x1, x2);
 						ClearNibbles();
-						SetHighlighted(addressHighlighted + 1);
+						SetHighlighted(addressHighlighted + 2);
 						UpdateValues();
 					}
 					break;
@@ -955,6 +981,7 @@ namespace BizHawk.MultiClient
 					}
 					break;
 			}
+			MemoryViewerBox.Refresh();
 		}
 
 		private void PokeWord(int addr, byte _1, byte _2)