From fd42606cc0a4e550be51345e32e628112f1a2e6f Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 13 Apr 2014 13:14:00 +0000 Subject: [PATCH] N64 Virtual Pad - only tab stops on analog boxes --- .../VirtualPads/VirtualPadForm.Designer.cs | 30 ++++++++++--------- .../VirtualPads/VirtualPadN64.Designer.cs | 14 +++++++++ .../tools/VirtualPads/VirtualPadN64Control.cs | 6 ++-- 3 files changed, 34 insertions(+), 16 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.Designer.cs index f761a79b7c..d7486f2b71 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadForm.Designer.cs @@ -36,15 +36,15 @@ this.menuStrip1 = new MenuStripEx(); this.OptionsSubMenu = new System.Windows.Forms.ToolStripMenuItem(); this.AutoloadMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.SaveWindowPositionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlwaysOnTopMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.RestoreDefaultSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.ExitMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.StickyBox = new System.Windows.Forms.CheckBox(); this.ClearButton = new System.Windows.Forms.Button(); - this.FloatingWindowMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.contextMenuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -110,6 +110,13 @@ this.AutoloadMenuItem.Text = "&Autoload"; this.AutoloadMenuItem.Click += new System.EventHandler(this.AutoloadMenuItem_Click); // + // SaveWindowPositionMenuItem + // + this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; + this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); + this.SaveWindowPositionMenuItem.Text = "&Save Window Position"; + this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + // // AlwaysOnTopMenuItem // this.AlwaysOnTopMenuItem.Name = "AlwaysOnTopMenuItem"; @@ -117,12 +124,12 @@ this.AlwaysOnTopMenuItem.Text = "Always On Top"; this.AlwaysOnTopMenuItem.Click += new System.EventHandler(this.AlwaysOnTopMenuItem_Click); // - // SaveWindowPositionMenuItem + // FloatingWindowMenuItem // - this.SaveWindowPositionMenuItem.Name = "SaveWindowPositionMenuItem"; - this.SaveWindowPositionMenuItem.Size = new System.Drawing.Size(199, 22); - this.SaveWindowPositionMenuItem.Text = "&Save Window Position"; - this.SaveWindowPositionMenuItem.Click += new System.EventHandler(this.SaveWindowPositionMenuItem_Click); + this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; + this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); + this.FloatingWindowMenuItem.Text = "Floating Window"; + this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); // // toolStripSeparator2 // @@ -157,6 +164,7 @@ this.StickyBox.Name = "StickyBox"; this.StickyBox.Size = new System.Drawing.Size(55, 17); this.StickyBox.TabIndex = 7; + this.StickyBox.TabStop = false; this.StickyBox.Text = "Sticky"; this.StickyBox.UseVisualStyleBackColor = true; this.StickyBox.CheckedChanged += new System.EventHandler(this.StickyBox_CheckedChanged); @@ -168,17 +176,11 @@ this.ClearButton.Name = "ClearButton"; this.ClearButton.Size = new System.Drawing.Size(75, 23); this.ClearButton.TabIndex = 8; + this.ClearButton.TabStop = false; this.ClearButton.Text = "&Clear"; this.ClearButton.UseVisualStyleBackColor = true; this.ClearButton.Click += new System.EventHandler(this.ClearMenuItem_Click); // - // FloatingWindowMenuItem - // - this.FloatingWindowMenuItem.Name = "FloatingWindowMenuItem"; - this.FloatingWindowMenuItem.Size = new System.Drawing.Size(199, 22); - this.FloatingWindowMenuItem.Text = "Floating Window"; - this.FloatingWindowMenuItem.Click += new System.EventHandler(this.FloatingWindowMenuItem_Click); - // // VirtualPadForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.Designer.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.Designer.cs index 2f64e91a0c..bc2943e07e 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.Designer.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64.Designer.cs @@ -117,6 +117,7 @@ this.CD.Name = "CD"; this.CD.Size = new System.Drawing.Size(31, 23); this.CD.TabIndex = 17; + this.CD.TabStop = false; this.CD.Text = "cD"; this.CD.UseVisualStyleBackColor = true; // @@ -129,6 +130,7 @@ this.CR.Name = "CR"; this.CR.Size = new System.Drawing.Size(31, 23); this.CR.TabIndex = 16; + this.CR.TabStop = false; this.CR.Text = "cR"; this.CR.UseVisualStyleBackColor = true; // @@ -141,6 +143,7 @@ this.CL.Name = "CL"; this.CL.Size = new System.Drawing.Size(29, 23); this.CL.TabIndex = 15; + this.CL.TabStop = false; this.CL.Text = "cL"; this.CL.UseVisualStyleBackColor = true; // @@ -153,6 +156,7 @@ this.CU.Name = "CU"; this.CU.Size = new System.Drawing.Size(31, 23); this.CU.TabIndex = 14; + this.CU.TabStop = false; this.CU.Text = "cU"; this.CU.UseVisualStyleBackColor = true; // @@ -165,6 +169,7 @@ this.BA.Name = "BA"; this.BA.Size = new System.Drawing.Size(24, 23); this.BA.TabIndex = 13; + this.BA.TabStop = false; this.BA.Text = "A"; this.BA.UseVisualStyleBackColor = true; // @@ -177,6 +182,7 @@ this.BB.Name = "BB"; this.BB.Size = new System.Drawing.Size(24, 23); this.BB.TabIndex = 12; + this.BB.TabStop = false; this.BB.Text = "B"; this.BB.UseVisualStyleBackColor = true; // @@ -189,6 +195,7 @@ this.BZ.Name = "BZ"; this.BZ.Size = new System.Drawing.Size(24, 23); this.BZ.TabIndex = 11; + this.BZ.TabStop = false; this.BZ.Text = "Z"; this.BZ.UseVisualStyleBackColor = true; // @@ -201,6 +208,7 @@ this.BS.Name = "BS"; this.BS.Size = new System.Drawing.Size(24, 23); this.BS.TabIndex = 10; + this.BS.TabStop = false; this.BS.Text = "S"; this.BS.UseVisualStyleBackColor = true; // @@ -213,6 +221,7 @@ this.BR.Name = "BR"; this.BR.Size = new System.Drawing.Size(25, 23); this.BR.TabIndex = 9; + this.BR.TabStop = false; this.BR.Text = "R"; this.BR.UseVisualStyleBackColor = true; // @@ -225,6 +234,7 @@ this.BL.Name = "BL"; this.BL.Size = new System.Drawing.Size(23, 23); this.BL.TabIndex = 8; + this.BL.TabStop = false; this.BL.Text = "L"; this.BL.UseVisualStyleBackColor = true; // @@ -238,6 +248,7 @@ this.PL.Name = "PL"; this.PL.Size = new System.Drawing.Size(22, 22); this.PL.TabIndex = 7; + this.PL.TabStop = false; this.PL.UseVisualStyleBackColor = true; // // PD @@ -250,6 +261,7 @@ this.PD.Name = "PD"; this.PD.Size = new System.Drawing.Size(22, 22); this.PD.TabIndex = 6; + this.PD.TabStop = false; this.PD.UseVisualStyleBackColor = true; // // PR @@ -262,6 +274,7 @@ this.PR.Name = "PR"; this.PR.Size = new System.Drawing.Size(22, 22); this.PR.TabIndex = 5; + this.PR.TabStop = false; this.PR.UseVisualStyleBackColor = true; // // PU @@ -274,6 +287,7 @@ this.PU.Name = "PU"; this.PU.Size = new System.Drawing.Size(22, 22); this.PU.TabIndex = 4; + this.PU.TabStop = false; this.PU.UseVisualStyleBackColor = true; // // AnalogControl1 diff --git a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64Control.cs b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64Control.cs index f447d034b5..4c82d1bdaa 100644 --- a/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64Control.cs +++ b/BizHawk.Client.EmuHawk/tools/VirtualPads/VirtualPadN64Control.cs @@ -29,7 +29,8 @@ namespace BizHawk.Client.EmuHawk TabIndex = 5, Text = "Power", TextAlign = ContentAlignment.BottomCenter, - UseVisualStyleBackColor = true + UseVisualStyleBackColor = true, + TabStop = false }; B1.CheckedChanged += Buttons_CheckedChanged; B1.ForeColor = Color.Red; @@ -42,7 +43,8 @@ namespace BizHawk.Client.EmuHawk TabIndex = 6, Text = "Reset", TextAlign = ContentAlignment.BottomCenter, - UseVisualStyleBackColor = true + UseVisualStyleBackColor = true, + TabStop = false }; B2.CheckedChanged += Buttons_CheckedChanged; B2.ForeColor = Color.Red;