From f292acee4f6a6af6a4fdeb4af9a468ed588b0fe9 Mon Sep 17 00:00:00 2001
From: feos-tas <feos-tas@users.sf.net>
Date: Mon, 26 Sep 2016 16:57:32 +0000
Subject: [PATCH] debugger: fix rightclicking the left panel that spawns
 hexeditor hexeditor: make caption a bit less chatty

---
 trunk/src/drivers/win/debugger.cpp |  2 +-
 trunk/src/drivers/win/memview.cpp  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/trunk/src/drivers/win/debugger.cpp b/trunk/src/drivers/win/debugger.cpp
index 18e488bc..a951c45b 100644
--- a/trunk/src/drivers/win/debugger.cpp
+++ b/trunk/src/drivers/win/debugger.cpp
@@ -2139,7 +2139,7 @@ BOOL CALLBACK DebuggerCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
 						i = disassembly_addresses[tmp];
 						if (i >= 0x8000)
 							// show ROM data in Hexeditor
-							ChangeMemViewFocus(2, GetNesFileAddress(i), -1);
+							ChangeMemViewFocus(3, GetNesFileAddress(i), -1);
 						else
 							// show RAM data in Hexeditor
 							ChangeMemViewFocus(0, i, -1);
diff --git a/trunk/src/drivers/win/memview.cpp b/trunk/src/drivers/win/memview.cpp
index af690613..8ba9f63e 100644
--- a/trunk/src/drivers/win/memview.cpp
+++ b/trunk/src/drivers/win/memview.cpp
@@ -628,14 +628,14 @@ void UpdateCaption()
 		if (EditingMode == MODE_NES_FILE)
 		{
 			if (CursorStartAddy < 16)
-				sprintf(str, "Hex Editor - ROM Header Offset 0x%06x", CursorStartAddy);
+				sprintf(str, "Hex Editor - ROM Header: 0x%X", CursorStartAddy);
 			else if (CursorStartAddy - 16 < (int)PRGsize[0])
-				sprintf(str, "Hex Editor - (PRG) ROM Offset 0x%06x", CursorStartAddy);
+				sprintf(str, "Hex Editor - (PRG) ROM: 0x%X", CursorStartAddy);
 			else if (CursorStartAddy - 16 - PRGsize[0] < (int)CHRsize[0])
-				sprintf(str, "Hex Editor - (CHR) ROM Offset 0x%06x", CursorStartAddy);
+				sprintf(str, "Hex Editor - (CHR) ROM: 0x%X", CursorStartAddy);
 		} else
 		{
-			sprintf(str, "Hex Editor - %s Offset 0x%06x", EditString[EditingMode], CursorStartAddy);
+			sprintf(str, "Hex Editor - %s: 0x%X", EditString[EditingMode], CursorStartAddy);
 		}
 
 		if (EditingMode == MODE_NES_MEMORY && symbDebugEnabled)
@@ -660,7 +660,7 @@ void UpdateCaption()
 		}
 	} else
 	{
-		sprintf(str, "Hex Editor - %s Offset 0x%06x - 0x%06x, 0x%x bytes selected ",
+		sprintf(str, "Hex Editor - %s: 0x%X - 0x%X (0x%X)",
 			EditString[EditingMode], CursorStartAddy, CursorEndAddy, CursorEndAddy - CursorStartAddy + 1);
 	}
 	SetWindowText(hMemView,str);