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

Linux: Fixed some layout issues

Browse source
This commit is contained in:
Sour 2019-01-27 01:33:26 -05:00
parent 1e58065154
commit d45c70be8a
5 changed files with 48 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
GUI.NET/Controls/ctrlHorizontalTrackbar.Designer.cs generated
View file

@ -47,16 +47,18 @@
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.RowCount = 3;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
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(206, 55);
this.tableLayoutPanel1.Size = new System.Drawing.Size(206, 50);
this.tableLayoutPanel1.TabIndex = 0;
//
// trackBar
//
this.trackBar.AutoSize = false;
this.trackBar.Dock = System.Windows.Forms.DockStyle.Fill;
this.trackBar.Location = new System.Drawing.Point(0, 20);
this.trackBar.Location = new System.Drawing.Point(0, 13);
this.trackBar.Margin = new System.Windows.Forms.Padding(0);
this.trackBar.Maximum = 100;
this.trackBar.Minimum = -100;
@ -72,7 +74,7 @@
this.lblValue.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.lblValue.BackColor = System.Drawing.Color.White;
this.lblValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.lblValue.Location = new System.Drawing.Point(174, 20);
this.lblValue.Location = new System.Drawing.Point(174, 13);
this.lblValue.MinimumSize = new System.Drawing.Size(30, 17);
this.lblValue.Name = "lblValue";
this.lblValue.Size = new System.Drawing.Size(30, 17);
@ -86,7 +88,7 @@
this.lblText.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblText.Location = new System.Drawing.Point(3, 0);
this.lblText.Name = "lblText";
this.lblText.Size = new System.Drawing.Size(165, 20);
this.lblText.Size = new System.Drawing.Size(165, 13);
this.lblText.TabIndex = 18;
this.lblText.Text = "Text";
this.lblText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@ -97,10 +99,8 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.tableLayoutPanel1);
this.Margin = new System.Windows.Forms.Padding(0);
this.MaximumSize = new System.Drawing.Size(400, 55);
this.MinimumSize = new System.Drawing.Size(206, 55);
this.Name = "ctrlHorizontalTrackbar";
this.Size = new System.Drawing.Size(206, 55);
this.Size = new System.Drawing.Size(206, 50);
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.trackBar)).EndInit();

50
GUI.NET/Forms/Cheats/frmCheat.Designer.cs generated
View file

@ -43,7 +43,6 @@
this.lblAddress = new System.Windows.Forms.Label();
this.txtAddress = new System.Windows.Forms.TextBox();
this.lblNewValue = new System.Windows.Forms.Label();
this.flowLayoutPanel2 = new System.Windows.Forms.FlowLayoutPanel();
this.radRelativeAddress = new System.Windows.Forms.RadioButton();
this.radAbsoluteAddress = new System.Windows.Forms.RadioButton();
this.txtValue = new System.Windows.Forms.TextBox();
@ -51,11 +50,12 @@
this.chkCompareValue = new System.Windows.Forms.CheckBox();
this.chkEnabled = new System.Windows.Forms.CheckBox();
this.txtGameName = new System.Windows.Forms.TextBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.tableLayoutPanel2.SuspendLayout();
this.grpCode.SuspendLayout();
this.tlpAdd.SuspendLayout();
this.tlpCustom.SuspendLayout();
this.flowLayoutPanel2.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// baseConfigPanel
@ -219,10 +219,10 @@
this.tlpCustom.Controls.Add(this.lblAddress, 0, 0);
this.tlpCustom.Controls.Add(this.txtAddress, 1, 0);
this.tlpCustom.Controls.Add(this.lblNewValue, 0, 2);
this.tlpCustom.Controls.Add(this.flowLayoutPanel2, 1, 1);
this.tlpCustom.Controls.Add(this.txtValue, 1, 2);
this.tlpCustom.Controls.Add(this.txtCompare, 1, 3);
this.tlpCustom.Controls.Add(this.chkCompareValue, 0, 3);
this.tlpCustom.Controls.Add(this.tableLayoutPanel1, 0, 1);
this.tlpCustom.Dock = System.Windows.Forms.DockStyle.Fill;
this.tlpCustom.Location = new System.Drawing.Point(120, 55);
this.tlpCustom.Name = "tlpCustom";
@ -233,6 +233,7 @@
this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tlpCustom.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tlpCustom.Size = new System.Drawing.Size(250, 111);
this.tlpCustom.TabIndex = 4;
//
@ -259,23 +260,12 @@
//
this.lblNewValue.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.lblNewValue.AutoSize = true;
this.lblNewValue.Location = new System.Drawing.Point(3, 59);
this.lblNewValue.Location = new System.Drawing.Point(3, 56);
this.lblNewValue.Name = "lblNewValue";
this.lblNewValue.Size = new System.Drawing.Size(62, 13);
this.lblNewValue.TabIndex = 3;
this.lblNewValue.Text = "New Value:";
//
// flowLayoutPanel2
//
this.tlpCustom.SetColumnSpan(this.flowLayoutPanel2, 2);
this.flowLayoutPanel2.Controls.Add(this.radRelativeAddress);
this.flowLayoutPanel2.Controls.Add(this.radAbsoluteAddress);
this.flowLayoutPanel2.Location = new System.Drawing.Point(0, 26);
this.flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanel2.Name = "flowLayoutPanel2";
this.flowLayoutPanel2.Size = new System.Drawing.Size(250, 27);
this.flowLayoutPanel2.TabIndex = 4;
//
// radRelativeAddress
//
this.radRelativeAddress.AutoSize = true;
@ -302,7 +292,7 @@
//
// txtValue
//
this.txtValue.Location = new System.Drawing.Point(107, 56);
this.txtValue.Location = new System.Drawing.Point(107, 53);
this.txtValue.MaxLength = 2;
this.txtValue.Name = "txtValue";
this.txtValue.Size = new System.Drawing.Size(30, 20);
@ -312,7 +302,7 @@
// txtCompare
//
this.txtCompare.Enabled = false;
this.txtCompare.Location = new System.Drawing.Point(107, 82);
this.txtCompare.Location = new System.Drawing.Point(107, 79);
this.txtCompare.MaxLength = 2;
this.txtCompare.Name = "txtCompare";
this.txtCompare.Size = new System.Drawing.Size(30, 20);
@ -322,7 +312,7 @@
//
this.chkCompareValue.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.chkCompareValue.AutoSize = true;
this.chkCompareValue.Location = new System.Drawing.Point(3, 83);
this.chkCompareValue.Location = new System.Drawing.Point(3, 80);
this.chkCompareValue.Name = "chkCompareValue";
this.chkCompareValue.Size = new System.Drawing.Size(98, 17);
this.chkCompareValue.TabIndex = 7;
@ -350,6 +340,22 @@
this.txtGameName.Size = new System.Drawing.Size(237, 20);
this.txtGameName.TabIndex = 0;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
this.tlpCustom.SetColumnSpan(this.tableLayoutPanel1, 2);
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.radAbsoluteAddress, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.radRelativeAddress, 0, 0);
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 26);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(0, 0, 0, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(200, 24);
this.tableLayoutPanel1.TabIndex = 8;
//
// frmCheat
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -373,8 +379,8 @@
this.tlpAdd.PerformLayout();
this.tlpCustom.ResumeLayout(false);
this.tlpCustom.PerformLayout();
this.flowLayoutPanel2.ResumeLayout(false);
this.flowLayoutPanel2.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
}
@ -396,7 +402,6 @@
private System.Windows.Forms.Label lblAddress;
private System.Windows.Forms.TextBox txtAddress;
private System.Windows.Forms.Label lblNewValue;
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel2;
private System.Windows.Forms.RadioButton radRelativeAddress;
private System.Windows.Forms.RadioButton radAbsoluteAddress;
private System.Windows.Forms.TextBox txtValue;
@ -405,7 +410,6 @@
private System.Windows.Forms.Button btnBrowse;
private System.Windows.Forms.CheckBox chkEnabled;
private System.Windows.Forms.CheckBox chkCompareValue;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
}
}

6
GUI.NET/Forms/Config/frmInputConfig.Designer.cs generated
View file

@ -620,8 +620,8 @@
this.tableLayoutPanel4.Margin = new System.Windows.Forms.Padding(0);
this.tableLayoutPanel4.Name = "tableLayoutPanel4";
this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 35F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tableLayoutPanel4.Size = new System.Drawing.Size(356, 55);
this.tableLayoutPanel4.TabIndex = 3;
//
@ -642,6 +642,8 @@
this.trkControllerDeadzoneSize.LargeChange = 1;
this.trkControllerDeadzoneSize.Location = new System.Drawing.Point(155, 3);
this.trkControllerDeadzoneSize.Maximum = 4;
this.trkControllerDeadzoneSize.MaximumSize = new System.Drawing.Size(106, 29);
this.trkControllerDeadzoneSize.MinimumSize = new System.Drawing.Size(106, 29);
this.trkControllerDeadzoneSize.Name = "trkControllerDeadzoneSize";
this.trkControllerDeadzoneSize.Size = new System.Drawing.Size(106, 29);
this.trkControllerDeadzoneSize.TabIndex = 1;

10
GUI.NET/Forms/frmHelp.cs
View file

@ -26,10 +26,12 @@ namespace Mesen.GUI.Forms
base.OnLoad(e);
lblExample.Font = new Font(BaseControl.MonospaceFontFamily, BaseControl.DefaultFontSize - 2);
txtAudioOptions.Font = new Font(BaseControl.MonospaceFontFamily, BaseControl.DefaultFontSize - 4);
txtEmulationOptions.Font = new Font(BaseControl.MonospaceFontFamily, BaseControl.DefaultFontSize - 4);
txtVideoOptions.Font = new Font(BaseControl.MonospaceFontFamily, BaseControl.DefaultFontSize - 4);
txtGeneralOptions.Font = new Font(BaseControl.MonospaceFontFamily, BaseControl.DefaultFontSize - 4);
float fontSize = BaseControl.DefaultFontSize - (Program.IsMono ? 2 : 4);
txtAudioOptions.Font = new Font(BaseControl.MonospaceFontFamily, fontSize);
txtEmulationOptions.Font = new Font(BaseControl.MonospaceFontFamily, fontSize);
txtVideoOptions.Font = new Font(BaseControl.MonospaceFontFamily, fontSize);
txtGeneralOptions.Font = new Font(BaseControl.MonospaceFontFamily, fontSize);
lblExample.Text = ConvertSlashes(lblExample.Text);

2
GUI.NET/ThemeHelper.cs
View file

@ -71,6 +71,8 @@ namespace Mesen.GUI
{
item.ForeColor = item.Enabled ? theme.ToolStripItemForeColor : theme.ToolStripItemDisabledForeColor;
item.BackColor = theme.ToolStripItemBgColor;
item.Font = new Font("Microsoft Sans Serif", 8.25f);
item.EnabledChanged += (object sender, EventArgs e) => {
((ToolStripItem)sender).ForeColor = ((ToolStripItem)sender).Enabled ? theme.ToolStripItemForeColor : theme.ToolStripItemDisabledForeColor;
};