empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux: Fixed layout issues and crashes

Browse source
This commit is contained in:
Sour 2018-03-31 13:47:02 -04:00
parent 490ea3d5f6
commit 02ffd0bda3
5 changed files with 45 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
GUI.NET/Debugger/Controls/ApuViewer/ctrlDmcInfo.Designer.cs generated
View file

@ -51,7 +51,8 @@
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 9;
this.tableLayoutPanel1.ColumnCount = 10;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());

2
GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs
View file

@ -395,7 +395,7 @@ namespace Mesen.GUI.Debugger
private void ctrlCodeViewer_ScrollPositionChanged(object sender, EventArgs e)
{
_tooltipManager.Close(true);
_tooltipManager?.Close(true);
}
private void ctrlCodeViewer_MouseDoubleClick(object sender, MouseEventArgs e)

79
GUI.NET/Debugger/frmApuViewer.Designer.cs generated
View file

@ -69,10 +69,10 @@
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 4;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 66.66666F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.grpChannelControl, 2, 2);
this.tableLayoutPanel1.Controls.Add(this.grpSquare1, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.grpSquare2, 0, 1);
@ -93,13 +93,11 @@
//
// grpChannelControl
//
this.grpChannelControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.grpChannelControl.Controls.Add(this.tableLayoutPanel2);
this.grpChannelControl.Location = new System.Drawing.Point(714, 408);
this.grpChannelControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpChannelControl.Location = new System.Drawing.Point(712, 408);
this.grpChannelControl.Name = "grpChannelControl";
this.grpChannelControl.Size = new System.Drawing.Size(273, 121);
this.grpChannelControl.Size = new System.Drawing.Size(270, 121);
this.grpChannelControl.TabIndex = 8;
this.grpChannelControl.TabStop = false;
this.grpChannelControl.Text = "Channel Control (uncheck to mute)";
@ -130,7 +128,7 @@
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(267, 102);
this.tableLayoutPanel2.Size = new System.Drawing.Size(264, 102);
this.tableLayoutPanel2.TabIndex = 0;
//
// chkFds
@ -138,7 +136,7 @@
this.chkFds.AutoSize = true;
this.chkFds.Checked = true;
this.chkFds.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkFds.Location = new System.Drawing.Point(91, 0);
this.chkFds.Location = new System.Drawing.Point(90, 0);
this.chkFds.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.chkFds.Name = "chkFds";
this.chkFds.Size = new System.Drawing.Size(47, 17);
@ -208,7 +206,7 @@
this.chkMmc5.AutoSize = true;
this.chkMmc5.Checked = true;
this.chkMmc5.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkMmc5.Location = new System.Drawing.Point(91, 20);
this.chkMmc5.Location = new System.Drawing.Point(90, 20);
this.chkMmc5.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.chkMmc5.Name = "chkMmc5";
this.chkMmc5.Size = new System.Drawing.Size(57, 17);
@ -222,7 +220,7 @@
this.chkNamco.AutoSize = true;
this.chkNamco.Checked = true;
this.chkNamco.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkNamco.Location = new System.Drawing.Point(91, 40);
this.chkNamco.Location = new System.Drawing.Point(90, 40);
this.chkNamco.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.chkNamco.Name = "chkNamco";
this.chkNamco.Size = new System.Drawing.Size(60, 17);
@ -236,7 +234,7 @@
this.chkVrc7.AutoSize = true;
this.chkVrc7.Checked = true;
this.chkVrc7.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkVrc7.Location = new System.Drawing.Point(180, 20);
this.chkVrc7.Location = new System.Drawing.Point(178, 20);
this.chkVrc7.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.chkVrc7.Name = "chkVrc7";
this.chkVrc7.Size = new System.Drawing.Size(54, 17);
@ -264,7 +262,7 @@
this.chkSunsoft.AutoSize = true;
this.chkSunsoft.Checked = true;
this.chkSunsoft.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSunsoft.Location = new System.Drawing.Point(91, 60);
this.chkSunsoft.Location = new System.Drawing.Point(90, 60);
this.chkSunsoft.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.chkSunsoft.Name = "chkSunsoft";
this.chkSunsoft.Size = new System.Drawing.Size(62, 17);
@ -278,7 +276,7 @@
this.chkVrc6.AutoSize = true;
this.chkVrc6.Checked = true;
this.chkVrc6.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkVrc6.Location = new System.Drawing.Point(180, 0);
this.chkVrc6.Location = new System.Drawing.Point(178, 0);
this.chkVrc6.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
this.chkVrc6.Name = "chkVrc6";
this.chkVrc6.Size = new System.Drawing.Size(54, 17);
@ -289,13 +287,11 @@
//
// grpSquare1
//
this.grpSquare1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.grpSquare1.Controls.Add(this.ctrlSquareInfo1);
this.grpSquare1.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpSquare1.Location = new System.Drawing.Point(3, 3);
this.grpSquare1.Name = "grpSquare1";
this.grpSquare1.Size = new System.Drawing.Size(549, 196);
this.grpSquare1.Size = new System.Drawing.Size(547, 196);
this.grpSquare1.TabIndex = 3;
this.grpSquare1.TabStop = false;
this.grpSquare1.Text = "Square 1";
@ -305,18 +301,16 @@
this.ctrlSquareInfo1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlSquareInfo1.Location = new System.Drawing.Point(3, 16);
this.ctrlSquareInfo1.Name = "ctrlSquareInfo1";
this.ctrlSquareInfo1.Size = new System.Drawing.Size(543, 177);
this.ctrlSquareInfo1.Size = new System.Drawing.Size(541, 177);
this.ctrlSquareInfo1.TabIndex = 1;
//
// grpSquare2
//
this.grpSquare2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.grpSquare2.Controls.Add(this.ctrlSquareInfo2);
this.grpSquare2.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpSquare2.Location = new System.Drawing.Point(3, 205);
this.grpSquare2.Name = "grpSquare2";
this.grpSquare2.Size = new System.Drawing.Size(549, 197);
this.grpSquare2.Size = new System.Drawing.Size(547, 197);
this.grpSquare2.TabIndex = 2;
this.grpSquare2.TabStop = false;
this.grpSquare2.Text = "Square 2";
@ -326,19 +320,17 @@
this.ctrlSquareInfo2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlSquareInfo2.Location = new System.Drawing.Point(3, 16);
this.ctrlSquareInfo2.Name = "ctrlSquareInfo2";
this.ctrlSquareInfo2.Size = new System.Drawing.Size(543, 178);
this.ctrlSquareInfo2.Size = new System.Drawing.Size(541, 178);
this.ctrlSquareInfo2.TabIndex = 1;
//
// grpTriangle
//
this.grpTriangle.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.SetColumnSpan(this.grpTriangle, 2);
this.grpTriangle.Controls.Add(this.ctrlTriangleInfo);
this.grpTriangle.Location = new System.Drawing.Point(558, 3);
this.grpTriangle.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpTriangle.Location = new System.Drawing.Point(556, 3);
this.grpTriangle.Name = "grpTriangle";
this.grpTriangle.Size = new System.Drawing.Size(429, 196);
this.grpTriangle.Size = new System.Drawing.Size(426, 196);
this.grpTriangle.TabIndex = 4;
this.grpTriangle.TabStop = false;
this.grpTriangle.Text = "Triangle";
@ -348,19 +340,17 @@
this.ctrlTriangleInfo.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlTriangleInfo.Location = new System.Drawing.Point(3, 16);
this.ctrlTriangleInfo.Name = "ctrlTriangleInfo";
this.ctrlTriangleInfo.Size = new System.Drawing.Size(423, 177);
this.ctrlTriangleInfo.Size = new System.Drawing.Size(420, 177);
this.ctrlTriangleInfo.TabIndex = 0;
//
// grpNoise
//
this.grpNoise.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.SetColumnSpan(this.grpNoise, 2);
this.grpNoise.Controls.Add(this.ctrlNoiseInfo);
this.grpNoise.Location = new System.Drawing.Point(558, 205);
this.grpNoise.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpNoise.Location = new System.Drawing.Point(556, 205);
this.grpNoise.Name = "grpNoise";
this.grpNoise.Size = new System.Drawing.Size(429, 197);
this.grpNoise.Size = new System.Drawing.Size(426, 197);
this.grpNoise.TabIndex = 5;
this.grpNoise.TabStop = false;
this.grpNoise.Text = "Noise";
@ -370,18 +360,16 @@
this.ctrlNoiseInfo.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlNoiseInfo.Location = new System.Drawing.Point(3, 16);
this.ctrlNoiseInfo.Name = "ctrlNoiseInfo";
this.ctrlNoiseInfo.Size = new System.Drawing.Size(423, 178);
this.ctrlNoiseInfo.Size = new System.Drawing.Size(420, 178);
this.ctrlNoiseInfo.TabIndex = 0;
//
// grpDmc
//
this.grpDmc.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.grpDmc.Controls.Add(this.ctrlDmcInfo);
this.grpDmc.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpDmc.Location = new System.Drawing.Point(3, 408);
this.grpDmc.Name = "grpDmc";
this.grpDmc.Size = new System.Drawing.Size(549, 121);
this.grpDmc.Size = new System.Drawing.Size(547, 121);
this.grpDmc.TabIndex = 6;
this.grpDmc.TabStop = false;
this.grpDmc.Text = "DMC";
@ -391,16 +379,14 @@
this.ctrlDmcInfo.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlDmcInfo.Location = new System.Drawing.Point(3, 16);
this.ctrlDmcInfo.Name = "ctrlDmcInfo";
this.ctrlDmcInfo.Size = new System.Drawing.Size(543, 102);
this.ctrlDmcInfo.Size = new System.Drawing.Size(541, 102);
this.ctrlDmcInfo.TabIndex = 0;
//
// grpFrameCounter
//
this.grpFrameCounter.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.grpFrameCounter.Controls.Add(this.ctrlFrameCounterInfo);
this.grpFrameCounter.Location = new System.Drawing.Point(558, 408);
this.grpFrameCounter.Dock = System.Windows.Forms.DockStyle.Fill;
this.grpFrameCounter.Location = new System.Drawing.Point(556, 408);
this.grpFrameCounter.Name = "grpFrameCounter";
this.grpFrameCounter.Size = new System.Drawing.Size(150, 121);
this.grpFrameCounter.TabIndex = 7;
@ -409,9 +395,10 @@
//
// ctrlFrameCounterInfo
//
this.ctrlFrameCounterInfo.Dock = System.Windows.Forms.DockStyle.Fill;
this.ctrlFrameCounterInfo.Location = new System.Drawing.Point(3, 16);
this.ctrlFrameCounterInfo.Name = "ctrlFrameCounterInfo";
this.ctrlFrameCounterInfo.Size = new System.Drawing.Size(165, 102);
this.ctrlFrameCounterInfo.Size = new System.Drawing.Size(144, 102);
this.ctrlFrameCounterInfo.TabIndex = 0;
//
// tmrUpdate

4
GUI.NET/Debugger/frmApuViewer.cs
View file

@ -20,6 +20,10 @@ namespace Mesen.GUI.Debugger
if(LicenseManager.UsageMode != LicenseUsageMode.Designtime) {
tmrUpdate.Start();
if(Program.IsMono) {
this.Width = (int)(this.Width * 1.2);
}
}
}

5
GUI.NET/Forms/frmMain.cs
View file

@ -289,6 +289,11 @@ namespace Mesen.GUI.Forms
return;
}
//Stop menu update timer, and process all pending events before stopping the core
//This prevents some rare crashes on shutdown
menuTimer.Stop();
Application.DoEvents();
if(_notifListener != null) {
_notifListener.Dispose();
_notifListener = null;