Debugger: move text to display cpu select box properly, fixes #3026

This commit is contained in:
alyosha-tas 2022-01-23 09:54:41 -05:00
parent e7203db6ad
commit 01febd06de
1 changed files with 298 additions and 291 deletions

View File

@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.menuStrip1 = new MenuStripEx(); this.menuStrip1 = new BizHawk.WinForms.Controls.MenuStripEx();
this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.fileToolStripMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.DebugSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.DebugSubMenu = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.StepIntoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.StepIntoMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
@ -46,7 +46,7 @@ namespace BizHawk.Client.EmuHawk
this.DisassemblerBox = new System.Windows.Forms.GroupBox(); this.DisassemblerBox = new System.Windows.Forms.GroupBox();
this.ToPCBtn = new System.Windows.Forms.Button(); this.ToPCBtn = new System.Windows.Forms.Button();
this.label1 = new BizHawk.WinForms.Controls.LocLabelEx(); this.label1 = new BizHawk.WinForms.Controls.LocLabelEx();
this.DisassemblerView = new InputRoll(); this.DisassemblerView = new BizHawk.Client.EmuHawk.InputRoll();
this.DisassemblerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.DisassemblerContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.AddBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx(); this.AddBreakpointContextMenuItem = new BizHawk.WinForms.Controls.ToolStripMenuItemEx();
this.StepOutBtn = new System.Windows.Forms.Button(); this.StepOutBtn = new System.Windows.Forms.Button();
@ -156,9 +156,9 @@ namespace BizHawk.Client.EmuHawk
this.BreakPointControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.BreakPointControl1.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)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.BreakPointControl1.MainForm = null;
this.BreakPointControl1.Core = null; this.BreakPointControl1.Core = null;
this.BreakPointControl1.Location = new System.Drawing.Point(8, 19); this.BreakPointControl1.Location = new System.Drawing.Point(8, 19);
this.BreakPointControl1.MainForm = null;
this.BreakPointControl1.Mcs = null; this.BreakPointControl1.Mcs = null;
this.BreakPointControl1.MemoryDomains = null; this.BreakPointControl1.MemoryDomains = null;
this.BreakPointControl1.Name = "BreakPointControl1"; this.BreakPointControl1.Name = "BreakPointControl1";
@ -193,28 +193,35 @@ namespace BizHawk.Client.EmuHawk
// //
// label1 // label1
// //
this.label1.Location = new System.Drawing.Point(6, 23); this.label1.Location = new System.Drawing.Point(6, 51);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Text = "Cpu: Use '[' or ']' to change address, hold 'shift' for speed."; this.label1.Text = "Cpu: Use \'[\' or \']\' to change address, hold \'shift\' for speed.";
// //
// DisassemblerView // DisassemblerView
// //
this.DisassemblerView.AllowColumnReorder = false;
this.DisassemblerView.AllowColumnResize = true;
this.DisassemblerView.AllowMassNavigationShortcuts = true;
this.DisassemblerView.AllowRightClickSelection = true;
this.DisassemblerView.AlwaysScroll = false;
this.DisassemblerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.DisassemblerView.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)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.DisassemblerView.CellWidthPadding = 3; this.DisassemblerView.CellHeightPadding = 0;
this.DisassemblerView.AllowColumnReorder = false; this.DisassemblerView.ChangeSelectionWhenPaging = true;
this.DisassemblerView.AllowColumnResize = true;
this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu; this.DisassemblerView.ContextMenuStrip = this.DisassemblerContextMenu;
this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F); this.DisassemblerView.Font = new System.Drawing.Font("Courier New", 8F);
this.DisassemblerView.FullRowSelect = true; this.DisassemblerView.FullRowSelect = true;
this.DisassemblerView.GridLines = true; this.DisassemblerView.HorizontalOrientation = false;
this.DisassemblerView.RowCount = 0; this.DisassemblerView.LetKeysModifySelection = false;
this.DisassemblerView.Location = new System.Drawing.Point(6, 39); this.DisassemblerView.Location = new System.Drawing.Point(6, 67);
this.DisassemblerView.Name = "DisassemblerView"; this.DisassemblerView.Name = "DisassemblerView";
this.DisassemblerView.Size = new System.Drawing.Size(395, 476); this.DisassemblerView.RowCount = 0;
this.DisassemblerView.ScrollSpeed = 0;
this.DisassemblerView.SeekingCutoffInterval = 0;
this.DisassemblerView.Size = new System.Drawing.Size(395, 448);
this.DisassemblerView.TabIndex = 1; this.DisassemblerView.TabIndex = 1;
this.DisassemblerView.RowScroll += new InputRoll.RowScrollEvent(this.DisassemblerView_Scroll); this.DisassemblerView.RowScroll += new BizHawk.Client.EmuHawk.InputRoll.RowScrollEvent(this.DisassemblerView_Scroll);
this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged); this.DisassemblerView.SizeChanged += new System.EventHandler(this.DisassemblerView_SizeChanged);
this.DisassemblerView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DisassemblerView_KeyDown); this.DisassemblerView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DisassemblerView_KeyDown);
// //
@ -223,7 +230,7 @@ namespace BizHawk.Client.EmuHawk
this.DisassemblerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.DisassemblerContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.AddBreakpointContextMenuItem}); this.AddBreakpointContextMenuItem});
this.DisassemblerContextMenu.Name = "DisassemblerContextMenu"; this.DisassemblerContextMenu.Name = "DisassemblerContextMenu";
this.DisassemblerContextMenu.Size = new System.Drawing.Size(148, 26); this.DisassemblerContextMenu.Size = new System.Drawing.Size(157, 26);
this.DisassemblerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.DisassemblerContextMenu_Opening); this.DisassemblerContextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.DisassemblerContextMenu_Opening);
// //
// AddBreakpointContextMenuItem // AddBreakpointContextMenuItem