diff --git a/GUI.NET/Debugger/frmDebugger.Designer.cs b/GUI.NET/Debugger/frmDebugger.Designer.cs index c8c1101e..54d076c8 100644 --- a/GUI.NET/Debugger/frmDebugger.Designer.cs +++ b/GUI.NET/Debugger/frmDebugger.Designer.cs @@ -29,8 +29,6 @@ namespace Mesen.GUI.Debugger /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.tmrCdlRatios = new System.Windows.Forms.Timer(this.components); this.splitContainer = new Mesen.GUI.Controls.ctrlSplitContainer(); this.ctrlSplitContainerTop = new Mesen.GUI.Controls.ctrlSplitContainer(); this.tlpTop = new System.Windows.Forms.TableLayoutPanel(); @@ -230,11 +228,6 @@ namespace Mesen.GUI.Debugger this.statusStrip.SuspendLayout(); this.SuspendLayout(); // - // tmrCdlRatios - // - this.tmrCdlRatios.Interval = 1000; - this.tmrCdlRatios.Tick += new System.EventHandler(this.tmrCdlRatios_Tick); - // // splitContainer // this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; @@ -255,7 +248,7 @@ namespace Mesen.GUI.Debugger this.splitContainer.Panel2.Controls.Add(this.tableLayoutPanel10); this.splitContainer.Panel2MinSize = 100; this.splitContainer.Size = new System.Drawing.Size(1075, 570); - this.splitContainer.SplitterDistance = 432; + this.splitContainer.SplitterDistance = 429; this.splitContainer.SplitterWidth = 7; this.splitContainer.TabIndex = 1; this.splitContainer.TabStop = false; @@ -279,7 +272,7 @@ namespace Mesen.GUI.Debugger // this.ctrlSplitContainerTop.Panel2.Controls.Add(this.tlpFunctionLabelLists); this.ctrlSplitContainerTop.Panel2MinSize = 150; - this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 432); + this.ctrlSplitContainerTop.Size = new System.Drawing.Size(1075, 429); this.ctrlSplitContainerTop.SplitterDistance = 750; this.ctrlSplitContainerTop.SplitterWidth = 7; this.ctrlSplitContainerTop.TabIndex = 3; @@ -300,8 +293,8 @@ namespace Mesen.GUI.Debugger this.tlpTop.Name = "tlpTop"; this.tlpTop.RowCount = 1; this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 432F)); - this.tlpTop.Size = new System.Drawing.Size(750, 432); + this.tlpTop.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 429F)); + this.tlpTop.Size = new System.Drawing.Size(750, 429); this.tlpTop.TabIndex = 2; // // panel1 @@ -312,7 +305,7 @@ namespace Mesen.GUI.Debugger this.panel1.Location = new System.Drawing.Point(3, 0); this.panel1.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(286, 432); + this.panel1.Size = new System.Drawing.Size(286, 429); this.panel1.TabIndex = 5; // // ctrlSourceViewer @@ -321,7 +314,7 @@ namespace Mesen.GUI.Debugger this.ctrlSourceViewer.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlSourceViewer.Location = new System.Drawing.Point(0, 0); this.ctrlSourceViewer.Name = "ctrlSourceViewer"; - this.ctrlSourceViewer.Size = new System.Drawing.Size(286, 432); + this.ctrlSourceViewer.Size = new System.Drawing.Size(286, 429); this.ctrlSourceViewer.SymbolProvider = null; this.ctrlSourceViewer.TabIndex = 7; this.ctrlSourceViewer.Visible = false; @@ -335,7 +328,7 @@ namespace Mesen.GUI.Debugger this.ctrlDebuggerCode.Location = new System.Drawing.Point(0, 0); this.ctrlDebuggerCode.Name = "ctrlDebuggerCode"; this.ctrlDebuggerCode.ShowMemoryValues = false; - this.ctrlDebuggerCode.Size = new System.Drawing.Size(286, 432); + this.ctrlDebuggerCode.Size = new System.Drawing.Size(286, 429); this.ctrlDebuggerCode.SymbolProvider = null; this.ctrlDebuggerCode.TabIndex = 2; this.ctrlDebuggerCode.OnEditCode += new Mesen.GUI.Debugger.ctrlDebuggerCode.AssemblerEventHandler(this.ctrlDebuggerCode_OnEditCode); @@ -349,7 +342,7 @@ namespace Mesen.GUI.Debugger this.panel2.Location = new System.Drawing.Point(292, 0); this.panel2.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1, 432); + this.panel2.Size = new System.Drawing.Size(1, 429); this.panel2.TabIndex = 6; // // ctrlSourceViewerSplit @@ -358,7 +351,7 @@ namespace Mesen.GUI.Debugger this.ctrlSourceViewerSplit.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlSourceViewerSplit.Location = new System.Drawing.Point(0, 0); this.ctrlSourceViewerSplit.Name = "ctrlSourceViewerSplit"; - this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 432); + this.ctrlSourceViewerSplit.Size = new System.Drawing.Size(1, 429); this.ctrlSourceViewerSplit.SymbolProvider = null; this.ctrlSourceViewerSplit.TabIndex = 8; this.ctrlSourceViewerSplit.Visible = false; @@ -372,7 +365,7 @@ namespace Mesen.GUI.Debugger this.ctrlDebuggerCodeSplit.Location = new System.Drawing.Point(0, 0); this.ctrlDebuggerCodeSplit.Name = "ctrlDebuggerCodeSplit"; this.ctrlDebuggerCodeSplit.ShowMemoryValues = false; - this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 432); + this.ctrlDebuggerCodeSplit.Size = new System.Drawing.Size(1, 429); this.ctrlDebuggerCodeSplit.SymbolProvider = null; this.ctrlDebuggerCodeSplit.TabIndex = 4; this.ctrlDebuggerCodeSplit.Visible = false; @@ -392,7 +385,7 @@ namespace Mesen.GUI.Debugger this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 432); + this.tableLayoutPanel1.Size = new System.Drawing.Size(458, 429); this.tableLayoutPanel1.TabIndex = 7; // // ctrlConsoleStatus @@ -416,7 +409,7 @@ namespace Mesen.GUI.Debugger this.tlpVerticalLayout.Name = "tlpVerticalLayout"; this.tlpVerticalLayout.RowCount = 1; this.tlpVerticalLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 32); + this.tlpVerticalLayout.Size = new System.Drawing.Size(458, 29); this.tlpVerticalLayout.TabIndex = 4; // // tlpFunctionLabelLists @@ -432,16 +425,16 @@ namespace Mesen.GUI.Debugger this.tlpFunctionLabelLists.RowCount = 2; this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tlpFunctionLabelLists.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tlpFunctionLabelLists.Size = new System.Drawing.Size(318, 432); + this.tlpFunctionLabelLists.Size = new System.Drawing.Size(318, 429); this.tlpFunctionLabelLists.TabIndex = 5; // // grpLabels // this.grpLabels.Controls.Add(this.ctrlLabelList); this.grpLabels.Dock = System.Windows.Forms.DockStyle.Fill; - this.grpLabels.Location = new System.Drawing.Point(3, 219); + this.grpLabels.Location = new System.Drawing.Point(3, 217); this.grpLabels.Name = "grpLabels"; - this.grpLabels.Size = new System.Drawing.Size(312, 210); + this.grpLabels.Size = new System.Drawing.Size(312, 209); this.grpLabels.TabIndex = 6; this.grpLabels.TabStop = false; this.grpLabels.Text = "Labels"; @@ -451,7 +444,7 @@ namespace Mesen.GUI.Debugger this.ctrlLabelList.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlLabelList.Location = new System.Drawing.Point(3, 16); this.ctrlLabelList.Name = "ctrlLabelList"; - this.ctrlLabelList.Size = new System.Drawing.Size(306, 191); + this.ctrlLabelList.Size = new System.Drawing.Size(306, 190); this.ctrlLabelList.TabIndex = 0; this.ctrlLabelList.OnFindOccurrence += new System.EventHandler(this.ctrlLabelList_OnFindOccurrence); this.ctrlLabelList.OnLabelSelected += new System.EventHandler(this.ctrlLabelList_OnLabelSelected); @@ -462,7 +455,7 @@ namespace Mesen.GUI.Debugger this.grpFunctions.Dock = System.Windows.Forms.DockStyle.Fill; this.grpFunctions.Location = new System.Drawing.Point(3, 3); this.grpFunctions.Name = "grpFunctions"; - this.grpFunctions.Size = new System.Drawing.Size(312, 210); + this.grpFunctions.Size = new System.Drawing.Size(312, 208); this.grpFunctions.TabIndex = 5; this.grpFunctions.TabStop = false; this.grpFunctions.Text = "Functions"; @@ -472,7 +465,7 @@ namespace Mesen.GUI.Debugger this.ctrlFunctionList.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlFunctionList.Location = new System.Drawing.Point(3, 16); this.ctrlFunctionList.Name = "ctrlFunctionList"; - this.ctrlFunctionList.Size = new System.Drawing.Size(306, 191); + this.ctrlFunctionList.Size = new System.Drawing.Size(306, 189); this.ctrlFunctionList.TabIndex = 0; this.ctrlFunctionList.OnFindOccurrence += new System.EventHandler(this.ctrlFunctionList_OnFindOccurrence); this.ctrlFunctionList.OnFunctionSelected += new System.EventHandler(this.ctrlFunctionList_OnFunctionSelected); @@ -503,7 +496,7 @@ namespace Mesen.GUI.Debugger this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tableLayoutPanel10.RowStyles.Add(new System.Windows.Forms.RowStyle()); - this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 131); + this.tableLayoutPanel10.Size = new System.Drawing.Size(1075, 134); this.tableLayoutPanel10.TabIndex = 0; // // grpWatch @@ -512,7 +505,7 @@ namespace Mesen.GUI.Debugger this.grpWatch.Dock = System.Windows.Forms.DockStyle.Fill; this.grpWatch.Location = new System.Drawing.Point(3, 3); this.grpWatch.Name = "grpWatch"; - this.grpWatch.Size = new System.Drawing.Size(352, 125); + this.grpWatch.Size = new System.Drawing.Size(352, 128); this.grpWatch.TabIndex = 2; this.grpWatch.TabStop = false; this.grpWatch.Text = "Watch"; @@ -522,7 +515,7 @@ namespace Mesen.GUI.Debugger this.ctrlWatch.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlWatch.Location = new System.Drawing.Point(3, 16); this.ctrlWatch.Name = "ctrlWatch"; - this.ctrlWatch.Size = new System.Drawing.Size(346, 106); + this.ctrlWatch.Size = new System.Drawing.Size(346, 109); this.ctrlWatch.TabIndex = 0; // // grpBreakpoints @@ -531,7 +524,7 @@ namespace Mesen.GUI.Debugger this.grpBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; this.grpBreakpoints.Location = new System.Drawing.Point(361, 3); this.grpBreakpoints.Name = "grpBreakpoints"; - this.grpBreakpoints.Size = new System.Drawing.Size(352, 125); + this.grpBreakpoints.Size = new System.Drawing.Size(352, 128); this.grpBreakpoints.TabIndex = 3; this.grpBreakpoints.TabStop = false; this.grpBreakpoints.Text = "Breakpoints"; @@ -541,7 +534,7 @@ namespace Mesen.GUI.Debugger this.ctrlBreakpoints.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlBreakpoints.Location = new System.Drawing.Point(3, 16); this.ctrlBreakpoints.Name = "ctrlBreakpoints"; - this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 106); + this.ctrlBreakpoints.Size = new System.Drawing.Size(346, 109); this.ctrlBreakpoints.TabIndex = 0; this.ctrlBreakpoints.BreakpointNavigation += new System.EventHandler(this.ctrlBreakpoints_BreakpointNavigation); // @@ -551,7 +544,7 @@ namespace Mesen.GUI.Debugger this.grpCallstack.Dock = System.Windows.Forms.DockStyle.Fill; this.grpCallstack.Location = new System.Drawing.Point(719, 3); this.grpCallstack.Name = "grpCallstack"; - this.grpCallstack.Size = new System.Drawing.Size(353, 125); + this.grpCallstack.Size = new System.Drawing.Size(353, 128); this.grpCallstack.TabIndex = 4; this.grpCallstack.TabStop = false; this.grpCallstack.Text = "Call Stack"; @@ -561,7 +554,7 @@ namespace Mesen.GUI.Debugger this.ctrlCallstack.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlCallstack.Location = new System.Drawing.Point(3, 16); this.ctrlCallstack.Name = "ctrlCallstack"; - this.ctrlCallstack.Size = new System.Drawing.Size(347, 106); + this.ctrlCallstack.Size = new System.Drawing.Size(347, 109); this.ctrlCallstack.TabIndex = 0; this.ctrlCallstack.FunctionSelected += new System.EventHandler(this.ctrlCallstack_FunctionSelected); // @@ -1905,7 +1898,6 @@ namespace Mesen.GUI.Debugger private System.Windows.Forms.StatusStrip statusStrip; private System.Windows.Forms.ToolStripStatusLabel lblPrgAnalysis; private System.Windows.Forms.ToolStripStatusLabel lblPrgAnalysisResult; - private System.Windows.Forms.Timer tmrCdlRatios; private System.Windows.Forms.ToolStripStatusLabel lblChrAnalysis; private System.Windows.Forms.ToolStripStatusLabel lblChrAnalysisResult; private System.Windows.Forms.ToolStripMenuItem autoLoadsaveCDLFileToolStripMenuItem; diff --git a/GUI.NET/Debugger/frmDebugger.cs b/GUI.NET/Debugger/frmDebugger.cs index 7aca05cd..c87ccada 100644 --- a/GUI.NET/Debugger/frmDebugger.cs +++ b/GUI.NET/Debugger/frmDebugger.cs @@ -184,8 +184,6 @@ namespace Mesen.GUI.Debugger UpdateDebuggerFlags(); UpdateCdlRatios(); UpdateFileOptions(); - - tmrCdlRatios.Start(); } protected override void OnShown(EventArgs e) @@ -456,6 +454,7 @@ namespace Mesen.GUI.Debugger ctrlCpuMemoryMapping.UpdateCpuRegions(state.Cartridge); ctrlPpuMemoryMapping.UpdatePpuRegions(state.Cartridge); ctrlConsoleStatus.UpdateStatus(ref state); + UpdateCdlRatios(); } ctrlWatch.UpdateWatch(false); })); @@ -593,6 +592,7 @@ namespace Mesen.GUI.Debugger ctrlConsoleStatus.UpdateStatus(ref state); ctrlWatch.UpdateWatch(); ctrlCallstack.UpdateCallstack(); + UpdateCdlRatios(); ctrlCpuMemoryMapping.UpdateCpuRegions(state.Cartridge); ctrlPpuMemoryMapping.UpdatePpuRegions(state.Cartridge); @@ -879,8 +879,6 @@ namespace Mesen.GUI.Debugger protected override void OnFormClosing(FormClosingEventArgs e) { - tmrCdlRatios.Stop(); - LabelManager.OnLabelUpdated -= LabelManager_OnLabelUpdated; BreakpointManager.BreakpointsChanged -= BreakpointManager_BreakpointsChanged; ctrlConsoleStatus.OnStateChanged -= ctrlConsoleStatus_OnStateChanged; @@ -932,11 +930,6 @@ namespace Mesen.GUI.Debugger UpdateDebugger(true, false); } - private void tmrCdlRatios_Tick(object sender, EventArgs e) - { - this.UpdateCdlRatios(); - } - private void mnuLoadCdlFile_Click(object sender, EventArgs e) { OpenFileDialog ofd = new OpenFileDialog(); diff --git a/GUI.NET/Debugger/frmDebugger.resx b/GUI.NET/Debugger/frmDebugger.resx index d0847c3e..7435e7b0 100644 --- a/GUI.NET/Debugger/frmDebugger.resx +++ b/GUI.NET/Debugger/frmDebugger.resx @@ -120,16 +120,13 @@ 17, 17 - - 215, 17 - 107, 17 - 337, 17 + 215, 17 - 446, 17 + 324, 17 \ No newline at end of file