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:
parent
d7bc642161
commit
20e0ffc8b8
|
@ -82,27 +82,27 @@
|
|||
this.toolStripSeparator1,
|
||||
this.exitToolStripMenuItem});
|
||||
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";
|
||||
//
|
||||
// dumpToFileToolStripMenuItem
|
||||
//
|
||||
this.dumpToFileToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.SaveAs;
|
||||
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.Click += new System.EventHandler(this.dumpToFileToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripSeparator1
|
||||
//
|
||||
this.toolStripSeparator1.Name = "toolStripSeparator1";
|
||||
this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6);
|
||||
this.toolStripSeparator1.Size = new System.Drawing.Size(146, 6);
|
||||
//
|
||||
// exitToolStripMenuItem
|
||||
//
|
||||
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
|
||||
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.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -117,14 +117,14 @@
|
|||
this.addToRamWatchToolStripMenuItem1,
|
||||
this.freezeAddressToolStripMenuItem});
|
||||
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.DropDownOpened += new System.EventHandler(this.optionsToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
// 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.DropDownOpened += new System.EventHandler(this.memoryDomainsToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
|
@ -135,47 +135,47 @@
|
|||
this.byteToolStripMenuItem1,
|
||||
this.byteToolStripMenuItem2});
|
||||
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";
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.byteToolStripMenuItem_Click);
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.byteToolStripMenuItem1_Click);
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.byteToolStripMenuItem2_Click);
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.enToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripSeparator2
|
||||
//
|
||||
this.toolStripSeparator2.Name = "toolStripSeparator2";
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(201, 6);
|
||||
this.toolStripSeparator2.Size = new System.Drawing.Size(196, 6);
|
||||
//
|
||||
// goToAddressToolStripMenuItem
|
||||
//
|
||||
this.goToAddressToolStripMenuItem.Name = "goToAddressToolStripMenuItem";
|
||||
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.Click += new System.EventHandler(this.goToAddressToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -183,7 +183,7 @@
|
|||
//
|
||||
this.addToRamWatchToolStripMenuItem1.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
|
||||
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.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem1_Click);
|
||||
//
|
||||
|
@ -191,7 +191,7 @@
|
|||
//
|
||||
this.freezeAddressToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
|
||||
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.Click += new System.EventHandler(this.freezeAddressToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -203,33 +203,33 @@
|
|||
this.toolStripSeparator3,
|
||||
this.restoreWindowSizeToolStripMenuItem});
|
||||
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.DropDownOpened += new System.EventHandler(this.settingsToolStripMenuItem_DropDownOpened);
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.autoloadToolStripMenuItem_Click);
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.saveWindowsSettingsToolStripMenuItem_Click);
|
||||
//
|
||||
// toolStripSeparator3
|
||||
//
|
||||
this.toolStripSeparator3.Name = "toolStripSeparator3";
|
||||
this.toolStripSeparator3.Size = new System.Drawing.Size(191, 6);
|
||||
this.toolStripSeparator3.Size = new System.Drawing.Size(189, 6);
|
||||
//
|
||||
// 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.Click += new System.EventHandler(this.restoreWindowSizeToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -240,13 +240,13 @@
|
|||
this.freezeToolStripMenuItem,
|
||||
this.addToRamWatchToolStripMenuItem});
|
||||
this.ViewerContextMenuStrip.Name = "ViewerContextMenuStrip";
|
||||
this.ViewerContextMenuStrip.Size = new System.Drawing.Size(176, 70);
|
||||
this.ViewerContextMenuStrip.Size = new System.Drawing.Size(175, 70);
|
||||
//
|
||||
// pokeToolStripMenuItem
|
||||
//
|
||||
this.pokeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.poke;
|
||||
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.Click += new System.EventHandler(this.pokeToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -254,7 +254,7 @@
|
|||
//
|
||||
this.freezeToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.Freeze;
|
||||
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.Click += new System.EventHandler(this.freezeToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -262,7 +262,7 @@
|
|||
//
|
||||
this.addToRamWatchToolStripMenuItem.Image = global::BizHawk.MultiClient.Properties.Resources.FindHS;
|
||||
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.Click += new System.EventHandler(this.addToRamWatchToolStripMenuItem_Click);
|
||||
//
|
||||
|
@ -293,6 +293,7 @@
|
|||
// AddressesLabel
|
||||
//
|
||||
this.AddressesLabel.AutoSize = true;
|
||||
this.AddressesLabel.BackColor = System.Drawing.Color.White;
|
||||
this.AddressesLabel.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
||||
this.AddressesLabel.Location = new System.Drawing.Point(6, 16);
|
||||
this.AddressesLabel.Name = "AddressesLabel";
|
||||
|
|
|
@ -52,6 +52,7 @@ namespace BizHawk.MultiClient
|
|||
public HexEditor()
|
||||
{
|
||||
InitializeComponent();
|
||||
AddressesLabel.BackColor = Color.Transparent;
|
||||
SetHeader();
|
||||
Closing += (o, e) => SaveConfigSettings();
|
||||
AddressesLabel.Font = font;
|
||||
|
@ -94,13 +95,10 @@ namespace BizHawk.MultiClient
|
|||
{
|
||||
if (!this.IsHandleCreated || this.IsDisposed) return;
|
||||
|
||||
GenerateMemoryViewString();
|
||||
//MemoryViewer.BlazingFast = true;
|
||||
//MemoryViewer.Refresh();
|
||||
//MemoryViewer.BlazingFast = false;
|
||||
AddressesLabel.Text = GenerateMemoryViewString();
|
||||
}
|
||||
|
||||
private void GenerateMemoryViewString()
|
||||
private string GenerateMemoryViewString()
|
||||
{
|
||||
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)
|
||||
{
|
||||
//MemoryViewer.SetUpScrollBar();
|
||||
//MemoryViewer.Refresh();
|
||||
SetUpScrollBar();
|
||||
UpdateValues();
|
||||
}
|
||||
|
||||
private void SetHeader()
|
||||
|
|
Loading…
Reference in New Issue