Hex Editor - make address label transparent so that highlighting effects will happen on the group box behind it, make GenerateMemoryViewString a value returning function, hook back up resizing event

This commit is contained in:
andres.delikat 2011-08-22 16:34:47 +00:00
parent d7bc642161
commit 20e0ffc8b8
2 changed files with 277 additions and 278 deletions

View File

@ -28,87 +28,87 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HexEditor)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(HexEditor));
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dumpToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dumpToFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.memoryDomainsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dataSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.byteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.byteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.byteToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.byteToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.byteToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.enToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.enToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.goToAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.goToAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.addToRamWatchToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.freezeAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.freezeAddressToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.autoloadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveWindowsSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.restoreWindowSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ViewerContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); this.ViewerContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
this.pokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.pokeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.freezeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.freezeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.addToRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.addToRamWatchToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.MemoryViewerBox = new System.Windows.Forms.GroupBox(); this.MemoryViewerBox = new System.Windows.Forms.GroupBox();
this.vScrollBar1 = new System.Windows.Forms.VScrollBar(); this.vScrollBar1 = new System.Windows.Forms.VScrollBar();
this.AddressesLabel = new System.Windows.Forms.Label(); this.AddressesLabel = new System.Windows.Forms.Label();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
this.ViewerContextMenuStrip.SuspendLayout(); this.ViewerContextMenuStrip.SuspendLayout();
this.MemoryViewerBox.SuspendLayout(); this.MemoryViewerBox.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// menuStrip1 // menuStrip1
// //
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.fileToolStripMenuItem, this.fileToolStripMenuItem,
this.optionsToolStripMenuItem, this.optionsToolStripMenuItem,
this.settingsToolStripMenuItem}); this.settingsToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(584, 24); this.menuStrip1.Size = new System.Drawing.Size(584, 24);
this.menuStrip1.TabIndex = 1; this.menuStrip1.TabIndex = 1;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
// fileToolStripMenuItem // fileToolStripMenuItem
// //
this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.dumpToFileToolStripMenuItem, this.dumpToFileToolStripMenuItem,
this.toolStripSeparator1, this.toolStripSeparator1,
this.exitToolStripMenuItem}); this.exitToolStripMenuItem});
this.fileToolStripMenuItem.Name = "fileToolStripMenuItem"; this.fileToolStripMenuItem.Name = "fileToolStripMenuItem";
this.fileToolStripMenuItem.Size = new System.Drawing.Size(35, 20); this.fileToolStripMenuItem.Size = new System.Drawing.Size(37, 20);
this.fileToolStripMenuItem.Text = "&File"; this.fileToolStripMenuItem.Text = "&File";
// //
// dumpToFileToolStripMenuItem // dumpToFileToolStripMenuItem
// //
this.dumpToFileToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs; this.dumpToFileToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem"; this.dumpToFileToolStripMenuItem.Name = "dumpToFileToolStripMenuItem";
this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.dumpToFileToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.dumpToFileToolStripMenuItem.Text = "&Dump to file..."; this.dumpToFileToolStripMenuItem.Text = "&Dump to file...";
this.dumpToFileToolStripMenuItem.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click); this.dumpToFileToolStripMenuItem.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click);
// //
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(146, 6);
// //
// exitToolStripMenuItem // exitToolStripMenuItem
// //
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4))); this.exitToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4)));
this.exitToolStripMenuItem.Size = new System.Drawing.Size(154, 22); this.exitToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
this.exitToolStripMenuItem.Text = "E&xit"; this.exitToolStripMenuItem.Text = "E&xit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
// //
// optionsToolStripMenuItem // optionsToolStripMenuItem
// //
this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.optionsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.memoryDomainsToolStripMenuItem, this.memoryDomainsToolStripMenuItem,
this.dataSizeToolStripMenuItem, this.dataSizeToolStripMenuItem,
this.enToolStripMenuItem, this.enToolStripMenuItem,
@ -116,211 +116,212 @@
this.goToAddressToolStripMenuItem, this.goToAddressToolStripMenuItem,
this.addToRamWatchToolStripMenuItem1, this.addToRamWatchToolStripMenuItem1,
this.freezeAddressToolStripMenuItem}); this.freezeAddressToolStripMenuItem});
this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
this.optionsToolStripMenuItem.Size = new System.Drawing.Size(56, 20); this.optionsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.optionsToolStripMenuItem.Text = "&Options"; this.optionsToolStripMenuItem.Text = "&Options";
this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened); this.optionsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
// //
// memoryDomainsToolStripMenuItem // memoryDomainsToolStripMenuItem
// //
this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem"; this.memoryDomainsToolStripMenuItem.Name = "memoryDomainsToolStripMenuItem";
this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.memoryDomainsToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains"; this.memoryDomainsToolStripMenuItem.Text = "&Memory Domains";
this.memoryDomainsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened); this.memoryDomainsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened);
// //
// dataSizeToolStripMenuItem // dataSizeToolStripMenuItem
// //
this.dataSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.dataSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.byteToolStripMenuItem, this.byteToolStripMenuItem,
this.byteToolStripMenuItem1, this.byteToolStripMenuItem1,
this.byteToolStripMenuItem2}); this.byteToolStripMenuItem2});
this.dataSizeToolStripMenuItem.Name = "dataSizeToolStripMenuItem"; this.dataSizeToolStripMenuItem.Name = "dataSizeToolStripMenuItem";
this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.dataSizeToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.dataSizeToolStripMenuItem.Text = "Data Size"; this.dataSizeToolStripMenuItem.Text = "Data Size";
// //
// byteToolStripMenuItem // byteToolStripMenuItem
// //
this.byteToolStripMenuItem.Name = "byteToolStripMenuItem"; this.byteToolStripMenuItem.Name = "byteToolStripMenuItem";
this.byteToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.byteToolStripMenuItem.Size = new System.Drawing.Size(106, 22);
this.byteToolStripMenuItem.Text = "1 Byte"; this.byteToolStripMenuItem.Text = "1 Byte";
this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click); this.byteToolStripMenuItem.Click += new System.EventHandler(this.byteToolStripMenuItem_Click);
// //
// byteToolStripMenuItem1 // byteToolStripMenuItem1
// //
this.byteToolStripMenuItem1.Name = "byteToolStripMenuItem1"; this.byteToolStripMenuItem1.Name = "byteToolStripMenuItem1";
this.byteToolStripMenuItem1.Size = new System.Drawing.Size(116, 22); this.byteToolStripMenuItem1.Size = new System.Drawing.Size(106, 22);
this.byteToolStripMenuItem1.Text = "2 Byte"; this.byteToolStripMenuItem1.Text = "2 Byte";
this.byteToolStripMenuItem1.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click); this.byteToolStripMenuItem1.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click);
// //
// byteToolStripMenuItem2 // byteToolStripMenuItem2
// //
this.byteToolStripMenuItem2.Name = "byteToolStripMenuItem2"; this.byteToolStripMenuItem2.Name = "byteToolStripMenuItem2";
this.byteToolStripMenuItem2.Size = new System.Drawing.Size(116, 22); this.byteToolStripMenuItem2.Size = new System.Drawing.Size(106, 22);
this.byteToolStripMenuItem2.Text = "4 Byte"; this.byteToolStripMenuItem2.Text = "4 Byte";
this.byteToolStripMenuItem2.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click); this.byteToolStripMenuItem2.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click);
// //
// enToolStripMenuItem // enToolStripMenuItem
// //
this.enToolStripMenuItem.Name = "enToolStripMenuItem"; this.enToolStripMenuItem.Name = "enToolStripMenuItem";
this.enToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.enToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.enToolStripMenuItem.Text = "Big Endian"; this.enToolStripMenuItem.Text = "Big Endian";
this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click); this.enToolStripMenuItem.Click += new System.EventHandler(this.enToolStripMenuItem_Click);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(201, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(196, 6);
// //
// goToAddressToolStripMenuItem // goToAddressToolStripMenuItem
// //
this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem"; this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem";
this.goToAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G))); this.goToAddressToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.G)));
this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.goToAddressToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.goToAddressToolStripMenuItem.Text = "&Go to Address..."; this.goToAddressToolStripMenuItem.Text = "&Go to Address...";
this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click); this.goToAddressToolStripMenuItem.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click);
// //
// addToRamWatchToolStripMenuItem1 // addToRamWatchToolStripMenuItem1
// //
this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1"; this.addToRamWatchToolStripMenuItem1.Name = "addToRamWatchToolStripMenuItem1";
this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(204, 22); this.addToRamWatchToolStripMenuItem1.Size = new System.Drawing.Size(199, 22);
this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch"; this.addToRamWatchToolStripMenuItem1.Text = "Add to Ram Watch";
this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click); this.addToRamWatchToolStripMenuItem1.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click);
// //
// freezeAddressToolStripMenuItem // freezeAddressToolStripMenuItem
// //
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem"; this.freezeAddressToolStripMenuItem.Name = "freezeAddressToolStripMenuItem";
this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(204, 22); this.freezeAddressToolStripMenuItem.Size = new System.Drawing.Size(199, 22);
this.freezeAddressToolStripMenuItem.Text = "&Freeze Address"; this.freezeAddressToolStripMenuItem.Text = "&Freeze Address";
this.freezeAddressToolStripMenuItem.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click); this.freezeAddressToolStripMenuItem.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click);
// //
// settingsToolStripMenuItem // settingsToolStripMenuItem
// //
this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.settingsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoloadToolStripMenuItem, this.autoloadToolStripMenuItem,
this.saveWindowsSettingsToolStripMenuItem, this.saveWindowsSettingsToolStripMenuItem,
this.toolStripSeparator3, this.toolStripSeparator3,
this.restoreWindowSizeToolStripMenuItem}); this.restoreWindowSizeToolStripMenuItem});
this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
this.settingsToolStripMenuItem.Size = new System.Drawing.Size(58, 20); this.settingsToolStripMenuItem.Size = new System.Drawing.Size(61, 20);
this.settingsToolStripMenuItem.Text = "&Settings"; this.settingsToolStripMenuItem.Text = "&Settings";
this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened); this.settingsToolStripMenuItem.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
// //
// autoloadToolStripMenuItem // autoloadToolStripMenuItem
// //
this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem"; this.autoloadToolStripMenuItem.Name = "autoloadToolStripMenuItem";
this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.autoloadToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.autoloadToolStripMenuItem.Text = "Auto-load"; this.autoloadToolStripMenuItem.Text = "Auto-load";
this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click); this.autoloadToolStripMenuItem.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
// //
// saveWindowsSettingsToolStripMenuItem // saveWindowsSettingsToolStripMenuItem
// //
this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem"; this.saveWindowsSettingsToolStripMenuItem.Name = "saveWindowsSettingsToolStripMenuItem";
this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.saveWindowsSettingsToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings"; this.saveWindowsSettingsToolStripMenuItem.Text = "Save windows settings";
this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click); this.saveWindowsSettingsToolStripMenuItem.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(191, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6);
// //
// restoreWindowSizeToolStripMenuItem // restoreWindowSizeToolStripMenuItem
// //
this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem"; this.restoreWindowSizeToolStripMenuItem.Name = "restoreWindowSizeToolStripMenuItem";
this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(194, 22); this.restoreWindowSizeToolStripMenuItem.Size = new System.Drawing.Size(192, 22);
this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size"; this.restoreWindowSizeToolStripMenuItem.Text = "&Restore Window Size";
this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click); this.restoreWindowSizeToolStripMenuItem.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
// //
// ViewerContextMenuStrip // ViewerContextMenuStrip
// //
this.ViewerContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.ViewerContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.pokeToolStripMenuItem, this.pokeToolStripMenuItem,
this.freezeToolStripMenuItem, this.freezeToolStripMenuItem,
this.addToRamWatchToolStripMenuItem}); this.addToRamWatchToolStripMenuItem});
this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip"; this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip";
this.ViewerContextMenuStrip.Size = new System.Drawing.Size(176, 70); this.ViewerContextMenuStrip.Size = new System.Drawing.Size(175, 70);
// //
// pokeToolStripMenuItem // pokeToolStripMenuItem
// //
this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke; this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem"; this.pokeToolStripMenuItem.Name = "pokeToolStripMenuItem";
this.pokeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.pokeToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.pokeToolStripMenuItem.Text = "&Poke"; this.pokeToolStripMenuItem.Text = "&Poke";
this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click); this.pokeToolStripMenuItem.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click);
// //
// freezeToolStripMenuItem // freezeToolStripMenuItem
// //
this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze; this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem"; this.freezeToolStripMenuItem.Name = "freezeToolStripMenuItem";
this.freezeToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.freezeToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.freezeToolStripMenuItem.Text = "&Freeze"; this.freezeToolStripMenuItem.Text = "&Freeze";
this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click); this.freezeToolStripMenuItem.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click);
// //
// addToRamWatchToolStripMenuItem // addToRamWatchToolStripMenuItem
// //
this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS; this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem"; this.addToRamWatchToolStripMenuItem.Name = "addToRamWatchToolStripMenuItem";
this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.addToRamWatchToolStripMenuItem.Size = new System.Drawing.Size(174, 22);
this.addToRamWatchToolStripMenuItem.Text = "&Add to Ram Watch"; this.addToRamWatchToolStripMenuItem.Text = "&Add to Ram Watch";
this.addToRamWatchToolStripMenuItem.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click); this.addToRamWatchToolStripMenuItem.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click);
// //
// MemoryViewerBox // MemoryViewerBox
// //
this.MemoryViewerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.MemoryViewerBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.MemoryViewerBox.Controls.Add(this.vScrollBar1); this.MemoryViewerBox.Controls.Add(this.vScrollBar1);
this.MemoryViewerBox.Controls.Add(this.AddressesLabel); this.MemoryViewerBox.Controls.Add(this.AddressesLabel);
this.MemoryViewerBox.Location = new System.Drawing.Point(12, 27); this.MemoryViewerBox.Location = new System.Drawing.Point(12, 27);
this.MemoryViewerBox.MaximumSize = new System.Drawing.Size(600, 1024); this.MemoryViewerBox.MaximumSize = new System.Drawing.Size(600, 1024);
this.MemoryViewerBox.Name = "MemoryViewerBox"; this.MemoryViewerBox.Name = "MemoryViewerBox";
this.MemoryViewerBox.Size = new System.Drawing.Size(558, 277); this.MemoryViewerBox.Size = new System.Drawing.Size(558, 277);
this.MemoryViewerBox.TabIndex = 2; this.MemoryViewerBox.TabIndex = 2;
this.MemoryViewerBox.TabStop = false; this.MemoryViewerBox.TabStop = false;
// //
// vScrollBar1 // vScrollBar1
// //
this.vScrollBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.vScrollBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.vScrollBar1.LargeChange = 16; this.vScrollBar1.LargeChange = 16;
this.vScrollBar1.Location = new System.Drawing.Point(539, 8); this.vScrollBar1.Location = new System.Drawing.Point(539, 8);
this.vScrollBar1.Name = "vScrollBar1"; this.vScrollBar1.Name = "vScrollBar1";
this.vScrollBar1.Size = new System.Drawing.Size(16, 266); this.vScrollBar1.Size = new System.Drawing.Size(16, 266);
this.vScrollBar1.TabIndex = 1; this.vScrollBar1.TabIndex = 1;
this.vScrollBar1.Scroll += new System.Windows.Forms.ScrollEventHandler(this.vScrollBar1_Scroll); this.vScrollBar1.Scroll += new System.Windows.Forms.ScrollEventHandler(this.vScrollBar1_Scroll);
// //
// AddressesLabel // AddressesLabel
// //
this.AddressesLabel.AutoSize = true; this.AddressesLabel.AutoSize = true;
this.AddressesLabel.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.AddressesLabel.BackColor = System.Drawing.Color.White;
this.AddressesLabel.Location = new System.Drawing.Point(6, 16); this.AddressesLabel.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.AddressesLabel.Name = "AddressesLabel"; this.AddressesLabel.Location = new System.Drawing.Point(6, 16);
this.AddressesLabel.Size = new System.Drawing.Size(28, 14); this.AddressesLabel.Name = "AddressesLabel";
this.AddressesLabel.TabIndex = 0; this.AddressesLabel.Size = new System.Drawing.Size(28, 14);
this.AddressesLabel.Text = "RAM"; this.AddressesLabel.TabIndex = 0;
// this.AddressesLabel.Text = "RAM";
// HexEditor //
// // HexEditor
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.ClientSize = new System.Drawing.Size(584, 316); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.MemoryViewerBox); this.ClientSize = new System.Drawing.Size(584, 316);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.MemoryViewerBox);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Controls.Add(this.menuStrip1);
this.MainMenuStrip = this.menuStrip1; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Name = "HexEditor"; this.MainMenuStrip = this.menuStrip1;
this.Text = "HexEditor"; this.Name = "HexEditor";
this.Load += new System.EventHandler(this.HexEditor_Load); this.Text = "HexEditor";
this.Resize += new System.EventHandler(this.HexEditor_Resize); this.Load += new System.EventHandler(this.HexEditor_Load);
this.ResizeEnd += new System.EventHandler(this.HexEditor_ResizeEnd); this.Resize += new System.EventHandler(this.HexEditor_Resize);
this.menuStrip1.ResumeLayout(false); this.ResizeEnd += new System.EventHandler(this.HexEditor_ResizeEnd);
this.menuStrip1.PerformLayout(); this.menuStrip1.ResumeLayout(false);
this.ViewerContextMenuStrip.ResumeLayout(false); this.menuStrip1.PerformLayout();
this.MemoryViewerBox.ResumeLayout(false); this.ViewerContextMenuStrip.ResumeLayout(false);
this.MemoryViewerBox.PerformLayout(); this.MemoryViewerBox.ResumeLayout(false);
this.ResumeLayout(false); this.MemoryViewerBox.PerformLayout();
this.PerformLayout(); this.ResumeLayout(false);
this.PerformLayout();
} }

View File

@ -52,6 +52,7 @@ namespace BizHawk.MultiClient
public HexEditor() public HexEditor()
{ {
InitializeComponent(); InitializeComponent();
AddressesLabel.BackColor = Color.Transparent;
SetHeader(); SetHeader();
Closing += (o, e) => SaveConfigSettings(); Closing += (o, e) => SaveConfigSettings();
AddressesLabel.Font = font; AddressesLabel.Font = font;
@ -94,13 +95,10 @@ namespace BizHawk.MultiClient
{ {
if (!this.IsHandleCreated || this.IsDisposed) return; if (!this.IsHandleCreated || this.IsDisposed) return;
GenerateMemoryViewString(); AddressesLabel.Text = GenerateMemoryViewString();
//MemoryViewer.BlazingFast = true;
//MemoryViewer.Refresh();
//MemoryViewer.BlazingFast = false;
} }
private void GenerateMemoryViewString() private string GenerateMemoryViewString()
{ {
unchecked unchecked
{ {
@ -169,7 +167,7 @@ namespace BizHawk.MultiClient
} }
} }
AddressesLabel.Text = rowStr.ToString(); return rowStr.ToString();
} }
} }
@ -415,8 +413,8 @@ namespace BizHawk.MultiClient
private void HexEditor_Resize(object sender, EventArgs e) private void HexEditor_Resize(object sender, EventArgs e)
{ {
//MemoryViewer.SetUpScrollBar(); SetUpScrollBar();
//MemoryViewer.Refresh(); UpdateValues();
} }
private void SetHeader() private void SetHeader()