From c88ad0040510ac941ec1422d367ddb7168c1c983 Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 30 Jul 2013 14:21:01 +0000 Subject: [PATCH] Analog bind - show sensitivity and dead zone as a percent, and make the max value on dead zone to be 30. Probably. I didn't test this change. --- .../AnalogBindControl.Designer.cs | 201 +++++++++--------- .../ControllerConfig/AnalogBindControl.cs | 4 +- 2 files changed, 103 insertions(+), 102 deletions(-) diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs index 4bac2c8f35..5b7c281e4d 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.Designer.cs @@ -28,106 +28,107 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.textBox1 = new System.Windows.Forms.TextBox(); - this.labelButtonName = new System.Windows.Forms.Label(); - this.trackBarSensitivity = new System.Windows.Forms.TrackBar(); - this.labelSensitivity = new System.Windows.Forms.Label(); - this.timer1 = new System.Windows.Forms.Timer(this.components); - this.buttonBind = new System.Windows.Forms.Button(); - this.trackBarDeadzone = new System.Windows.Forms.TrackBar(); - this.labelDeadzone = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.trackBarSensitivity)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.trackBarDeadzone)).BeginInit(); - this.SuspendLayout(); - // - // textBox1 - // - this.textBox1.Location = new System.Drawing.Point(3, 3); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(100, 20); - this.textBox1.TabIndex = 0; - // - // labelButtonName - // - this.labelButtonName.AutoSize = true; - this.labelButtonName.Location = new System.Drawing.Point(109, 6); - this.labelButtonName.Name = "labelButtonName"; - this.labelButtonName.Size = new System.Drawing.Size(54, 13); - this.labelButtonName.TabIndex = 1; - this.labelButtonName.Text = "Bindname"; - // - // trackBarSensitivity - // - this.trackBarSensitivity.LargeChange = 20; - this.trackBarSensitivity.Location = new System.Drawing.Point(267, 3); - this.trackBarSensitivity.Maximum = 20; - this.trackBarSensitivity.Minimum = -20; - this.trackBarSensitivity.Name = "trackBarSensitivity"; - this.trackBarSensitivity.Size = new System.Drawing.Size(104, 42); - this.trackBarSensitivity.SmallChange = 10; - this.trackBarSensitivity.TabIndex = 2; - this.trackBarSensitivity.TickFrequency = 10; - this.trackBarSensitivity.ValueChanged += new System.EventHandler(this.trackBarSensitivity_ValueChanged); - // - // labelSensitivity - // - this.labelSensitivity.AutoSize = true; - this.labelSensitivity.Location = new System.Drawing.Point(166, 6); - this.labelSensitivity.Name = "labelSensitivity"; - this.labelSensitivity.Size = new System.Drawing.Size(95, 13); - this.labelSensitivity.TabIndex = 3; - this.labelSensitivity.Text = "Sensitivity: 5 billion"; - // - // timer1 - // - this.timer1.Tick += new System.EventHandler(this.timer1_Tick); - // - // buttonBind - // - this.buttonBind.Location = new System.Drawing.Point(3, 29); - this.buttonBind.Name = "buttonBind"; - this.buttonBind.Size = new System.Drawing.Size(75, 23); - this.buttonBind.TabIndex = 4; - this.buttonBind.Text = "Bind!"; - this.buttonBind.UseVisualStyleBackColor = true; - this.buttonBind.Click += new System.EventHandler(this.buttonBind_Click); - // - // trackBarDeadzone - // - this.trackBarDeadzone.Location = new System.Drawing.Point(267, 51); - this.trackBarDeadzone.Name = "trackBarDeadzone"; - this.trackBarDeadzone.Size = new System.Drawing.Size(104, 42); - this.trackBarDeadzone.TabIndex = 5; - this.trackBarDeadzone.ValueChanged += new System.EventHandler(this.trackBarDeadzone_ValueChanged); - // - // labelDeadzone - // - this.labelDeadzone.AutoSize = true; - this.labelDeadzone.Location = new System.Drawing.Point(166, 60); - this.labelDeadzone.Name = "labelDeadzone"; - this.labelDeadzone.Size = new System.Drawing.Size(97, 13); - this.labelDeadzone.TabIndex = 6; - this.labelDeadzone.Text = "Deadzone: 5 billion"; - // - // AnalogBindControl - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.labelDeadzone); - this.Controls.Add(this.trackBarDeadzone); - this.Controls.Add(this.buttonBind); - this.Controls.Add(this.labelSensitivity); - this.Controls.Add(this.trackBarSensitivity); - this.Controls.Add(this.labelButtonName); - this.Controls.Add(this.textBox1); - this.Name = "AnalogBindControl"; - this.Size = new System.Drawing.Size(378, 99); - ((System.ComponentModel.ISupportInitialize)(this.trackBarSensitivity)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.trackBarDeadzone)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); + this.components = new System.ComponentModel.Container(); + this.textBox1 = new System.Windows.Forms.TextBox(); + this.labelButtonName = new System.Windows.Forms.Label(); + this.trackBarSensitivity = new System.Windows.Forms.TrackBar(); + this.labelSensitivity = new System.Windows.Forms.Label(); + this.timer1 = new System.Windows.Forms.Timer(this.components); + this.buttonBind = new System.Windows.Forms.Button(); + this.trackBarDeadzone = new System.Windows.Forms.TrackBar(); + this.labelDeadzone = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.trackBarSensitivity)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.trackBarDeadzone)).BeginInit(); + this.SuspendLayout(); + // + // textBox1 + // + this.textBox1.Location = new System.Drawing.Point(3, 3); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(100, 20); + this.textBox1.TabIndex = 0; + // + // labelButtonName + // + this.labelButtonName.AutoSize = true; + this.labelButtonName.Location = new System.Drawing.Point(109, 6); + this.labelButtonName.Name = "labelButtonName"; + this.labelButtonName.Size = new System.Drawing.Size(54, 13); + this.labelButtonName.TabIndex = 1; + this.labelButtonName.Text = "Bindname"; + // + // trackBarSensitivity + // + this.trackBarSensitivity.LargeChange = 20; + this.trackBarSensitivity.Location = new System.Drawing.Point(267, 3); + this.trackBarSensitivity.Maximum = 20; + this.trackBarSensitivity.Minimum = -20; + this.trackBarSensitivity.Name = "trackBarSensitivity"; + this.trackBarSensitivity.Size = new System.Drawing.Size(104, 45); + this.trackBarSensitivity.SmallChange = 10; + this.trackBarSensitivity.TabIndex = 2; + this.trackBarSensitivity.TickFrequency = 10; + this.trackBarSensitivity.ValueChanged += new System.EventHandler(this.trackBarSensitivity_ValueChanged); + // + // labelSensitivity + // + this.labelSensitivity.AutoSize = true; + this.labelSensitivity.Location = new System.Drawing.Point(166, 6); + this.labelSensitivity.Name = "labelSensitivity"; + this.labelSensitivity.Size = new System.Drawing.Size(95, 13); + this.labelSensitivity.TabIndex = 3; + this.labelSensitivity.Text = "Sensitivity: 5 billion"; + // + // timer1 + // + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // buttonBind + // + this.buttonBind.Location = new System.Drawing.Point(3, 29); + this.buttonBind.Name = "buttonBind"; + this.buttonBind.Size = new System.Drawing.Size(75, 23); + this.buttonBind.TabIndex = 4; + this.buttonBind.Text = "Bind!"; + this.buttonBind.UseVisualStyleBackColor = true; + this.buttonBind.Click += new System.EventHandler(this.buttonBind_Click); + // + // trackBarDeadzone + // + this.trackBarDeadzone.Location = new System.Drawing.Point(267, 51); + this.trackBarDeadzone.Maximum = 3; + this.trackBarDeadzone.Name = "trackBarDeadzone"; + this.trackBarDeadzone.Size = new System.Drawing.Size(104, 45); + this.trackBarDeadzone.TabIndex = 5; + this.trackBarDeadzone.ValueChanged += new System.EventHandler(this.trackBarDeadzone_ValueChanged); + // + // labelDeadzone + // + this.labelDeadzone.AutoSize = true; + this.labelDeadzone.Location = new System.Drawing.Point(166, 60); + this.labelDeadzone.Name = "labelDeadzone"; + this.labelDeadzone.Size = new System.Drawing.Size(97, 13); + this.labelDeadzone.TabIndex = 6; + this.labelDeadzone.Text = "Deadzone: 5 billion"; + // + // AnalogBindControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.labelDeadzone); + this.Controls.Add(this.trackBarDeadzone); + this.Controls.Add(this.buttonBind); + this.Controls.Add(this.labelSensitivity); + this.Controls.Add(this.trackBarSensitivity); + this.Controls.Add(this.labelButtonName); + this.Controls.Add(this.textBox1); + this.Name = "AnalogBindControl"; + this.Size = new System.Drawing.Size(378, 99); + ((System.ComponentModel.ISupportInitialize)(this.trackBarSensitivity)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.trackBarDeadzone)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); } diff --git a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs index b5d2a8c3f1..85bd3f569e 100644 --- a/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs +++ b/BizHawk.MultiClient/config/ControllerConfig/AnalogBindControl.cs @@ -68,13 +68,13 @@ namespace BizHawk.MultiClient.config.ControllerConfig private void trackBarSensitivity_ValueChanged(object sender, EventArgs e) { Bind.Mult = trackBarSensitivity.Value / 10.0f; - labelSensitivity.Text = string.Format("Sensitivity: {0}", Bind.Mult); + labelSensitivity.Text = String.Format("Sensitivity: {0}", (Bind.Mult*100)) + "%"; } private void trackBarDeadzone_ValueChanged(object sender, EventArgs e) { Bind.Deadzone = trackBarDeadzone.Value / 10.0f; - labelDeadzone.Text = string.Format("Deadzone: {0}", Bind.Deadzone); + labelDeadzone.Text = String.Format("Deadzone: {0}", (Bind.Deadzone*100)) + "%"; } } }