Auto scaling: All forms should have AutoScaleMode set to Font.

Auto scaling: All user controls should have AutoScaleMode set to Inherit (i.e. they inherit their containing form's AutoScaleMode, in this case Font). Explicitly setting an AutoScaleMode on user controls causes problems with child controls anchored to the bottom and/or right.
Remove explicitly set font in GenGameGenie form. Fonts set on the form/user control level cause problems with auto scaling.
Fix text box anchoring in DualGBFileSelector control.
This commit is contained in:
jdpurcell 2014-12-28 21:19:34 +00:00
parent 4d78052961
commit 30d3b02a7f
25 changed files with 74 additions and 89 deletions

View File

@ -84,8 +84,7 @@
//
// BizBoxInfoControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.CoreUrlLink);
this.Controls.Add(this.CorePortedLabel);
this.Controls.Add(this.CoreAuthorLabel);

View File

@ -109,8 +109,7 @@
//
// AnalogRangeConfigControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.RadialCheckbox);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);

View File

@ -136,8 +136,7 @@
//
// AnalogBindControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.buttonUnbind);
this.Controls.Add(this.buttonFlip);
this.Controls.Add(this.labelDeadzone);

View File

@ -50,8 +50,7 @@
//
// ControllerConfigPanel
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.ContextMenuStrip = this.contextMenuStrip1;
this.Name = "ControllerConfigPanel";
this.Size = new System.Drawing.Size(203, 292);

View File

@ -52,8 +52,7 @@
//
// FileExtensionPreferencesPicker
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.PlatformDropdown);
this.Controls.Add(this.FileExtensionLabel);
this.Name = "FileExtensionPreferencesPicker";

View File

@ -47,6 +47,8 @@
// textBox1
//
this.textBox1.AllowDrop = true;
this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.textBox1.Location = new System.Drawing.Point(3, 5);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(270, 20);
@ -67,8 +69,7 @@
//
// DualGBFileSelector
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.UseCurrentRomButton);
this.Controls.Add(this.button1);
this.Controls.Add(this.textBox1);

View File

@ -83,8 +83,7 @@
//
// GBPrefControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.checkBoxMuted);
this.Controls.Add(this.buttonPalette);
this.Controls.Add(this.buttonDefaults);

View File

@ -70,7 +70,8 @@
// GBPrefs
//
this.AcceptButton = this.buttonOK;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(448, 398);
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonOK);

View File

@ -79,8 +79,7 @@
//
// InputCompositeWidget
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.tableLayoutPanel1);
this.Name = "InputCompositeWidget";
this.Size = new System.Drawing.Size(492, 20);

View File

@ -28,57 +28,56 @@
/// </summary>
private void InitializeComponent()
{
this.EnabledCheckbox = new System.Windows.Forms.CheckBox();
this.PakTypeDropdown = new System.Windows.Forms.ComboBox();
this.ControllerNameLabel = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// EnabledCheckbox
//
this.EnabledCheckbox.AutoSize = true;
this.EnabledCheckbox.Location = new System.Drawing.Point(80, 2);
this.EnabledCheckbox.Name = "EnabledCheckbox";
this.EnabledCheckbox.Size = new System.Drawing.Size(78, 17);
this.EnabledCheckbox.TabIndex = 0;
this.EnabledCheckbox.Text = "Connected";
this.EnabledCheckbox.UseVisualStyleBackColor = true;
this.EnabledCheckbox.CheckedChanged += new System.EventHandler(this.EnabledCheckbox_CheckedChanged);
//
// PakTypeDropdown
//
this.PakTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.PakTypeDropdown.FormattingEnabled = true;
this.PakTypeDropdown.Items.AddRange(new object[] {
this.EnabledCheckbox = new System.Windows.Forms.CheckBox();
this.PakTypeDropdown = new System.Windows.Forms.ComboBox();
this.ControllerNameLabel = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// EnabledCheckbox
//
this.EnabledCheckbox.AutoSize = true;
this.EnabledCheckbox.Location = new System.Drawing.Point(80, 2);
this.EnabledCheckbox.Name = "EnabledCheckbox";
this.EnabledCheckbox.Size = new System.Drawing.Size(78, 17);
this.EnabledCheckbox.TabIndex = 0;
this.EnabledCheckbox.Text = "Connected";
this.EnabledCheckbox.UseVisualStyleBackColor = true;
this.EnabledCheckbox.CheckedChanged += new System.EventHandler(this.EnabledCheckbox_CheckedChanged);
//
// PakTypeDropdown
//
this.PakTypeDropdown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.PakTypeDropdown.FormattingEnabled = true;
this.PakTypeDropdown.Items.AddRange(new object[] {
"None",
"Memory Card",
"Rumble Pak",
"Transfer Pak"});
this.PakTypeDropdown.Location = new System.Drawing.Point(160, 0);
this.PakTypeDropdown.Name = "PakTypeDropdown";
this.PakTypeDropdown.Size = new System.Drawing.Size(121, 21);
this.PakTypeDropdown.TabIndex = 1;
//
// ControllerNameLabel
//
this.ControllerNameLabel.AutoSize = true;
this.ControllerNameLabel.Location = new System.Drawing.Point(3, 4);
this.ControllerNameLabel.Name = "ControllerNameLabel";
this.ControllerNameLabel.Size = new System.Drawing.Size(60, 13);
this.ControllerNameLabel.TabIndex = 2;
this.ControllerNameLabel.Text = "Controller 1";
//
// N64ControllerSettingControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.ControllerNameLabel);
this.Controls.Add(this.PakTypeDropdown);
this.Controls.Add(this.EnabledCheckbox);
this.Name = "N64ControllerSettingControl";
this.Size = new System.Drawing.Size(290, 22);
this.Load += new System.EventHandler(this.N64ControllerSettingControl_Load);
this.ResumeLayout(false);
this.PerformLayout();
this.PakTypeDropdown.Location = new System.Drawing.Point(160, 0);
this.PakTypeDropdown.Name = "PakTypeDropdown";
this.PakTypeDropdown.Size = new System.Drawing.Size(121, 21);
this.PakTypeDropdown.TabIndex = 1;
//
// ControllerNameLabel
//
this.ControllerNameLabel.AutoSize = true;
this.ControllerNameLabel.Location = new System.Drawing.Point(3, 4);
this.ControllerNameLabel.Name = "ControllerNameLabel";
this.ControllerNameLabel.Size = new System.Drawing.Size(60, 13);
this.ControllerNameLabel.TabIndex = 2;
this.ControllerNameLabel.Text = "Controller 1";
//
// N64ControllerSettingControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.ControllerNameLabel);
this.Controls.Add(this.PakTypeDropdown);
this.Controls.Add(this.EnabledCheckbox);
this.Name = "N64ControllerSettingControl";
this.Size = new System.Drawing.Size(290, 22);
this.Load += new System.EventHandler(this.N64ControllerSettingControl_Load);
this.ResumeLayout(false);
this.PerformLayout();
}

View File

@ -256,8 +256,7 @@
//
// CheatEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.EditButton);
this.Controls.Add(this.AddButton);
this.Controls.Add(this.BigEndianCheckBox);

View File

@ -132,8 +132,7 @@
//
// BreakpointControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.ToggleButton);
this.Controls.Add(this.BreakpointStatsLabel);
this.Controls.Add(this.RemoveBreakpointButton);

View File

@ -32,8 +32,7 @@
//
// RegisterBoxControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Name = "RegisterBoxControl";
this.Size = new System.Drawing.Size(240, 217);
this.Load += new System.EventHandler(this.RegisterBoxControl_Load);

View File

@ -284,7 +284,6 @@
this.Controls.Add(this.GameGenieCodeBox);
this.Controls.Add(this.AddCheatButton);
this.Controls.Add(this.menuStrip1);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(4, 2, 4, 2);

View File

@ -46,8 +46,7 @@
//
// BookmarksBranchesBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.BookmarksBranchesGroupBox);
this.Name = "BookmarksBranchesBox";
this.Size = new System.Drawing.Size(204, 253);

View File

@ -162,6 +162,8 @@ namespace BizHawk.Client.EmuHawk
// GreenzoneSettingsForm
//
this.AcceptButton = this.OkBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelBtn;
this.ClientSize = new System.Drawing.Size(308, 131);
this.Controls.Add(this.NumStatesLabel);

View File

@ -209,6 +209,8 @@ namespace BizHawk.Client.EmuHawk
// MovieHeaderEditor
//
this.AcceptButton = this.OkBtn;
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.CancelButton = this.CancelBtn;
this.ClientSize = new System.Drawing.Size(321, 273);
this.Controls.Add(this.label6);

View File

@ -42,8 +42,7 @@
//
// HistoryBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.HistoryGroupBox);
this.Name = "HistoryBox";
this.Size = new System.Drawing.Size(204, 350);

View File

@ -80,8 +80,7 @@
//
// MarkerControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.RemoveBtn);
this.Controls.Add(this.AddBtn);
this.Controls.Add(this.MarkerView);

View File

@ -145,8 +145,7 @@
//
// PlaybackBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.PlaybackGroupBox);
this.Name = "PlaybackBox";
this.Size = new System.Drawing.Size(204, 96);

View File

@ -44,8 +44,7 @@
//
// VirtualPad
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.PadBox);
this.Name = "VirtualPad";
this.Load += new System.EventHandler(this.VirtualPadControl_Load);

View File

@ -65,8 +65,7 @@
//
// VirtualPadAnalogButton
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.ValueLabel);
this.Controls.Add(this.DisplayNameLabel);
this.Controls.Add(this.AnalogTrackBar);

View File

@ -175,8 +175,7 @@
//
// VirtualPadAnalogStick
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.MaxYNumeric);
this.Controls.Add(this.MaxXNumeric);
this.Controls.Add(this.MaxLabel);

View File

@ -110,8 +110,7 @@
//
// VirtualPadDiscManager
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.Controls.Add(this.btnInsert);
this.Controls.Add(this.groupBox1);

View File

@ -94,8 +94,7 @@
//
// VirtualPadTargetScreen
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
this.Controls.Add(this.YLabel);
this.Controls.Add(this.YNumeric);
this.Controls.Add(this.XLabel);