ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Input Config - fix anchoring of L+R checkbox, Input Widget - fix ToString method so things like Ctrl+UpArrow doesn't break

This commit is contained in:
andres.delikat 2011-06-19 02:17:27 +00:00
parent f23c5f8382
commit 47ebedb40c
2 changed files with 275 additions and 271 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.MultiClient/config/InputConfig.Designer.cs generated
View File

@ -156,6 +156,7 @@
// //
// AllowLR // AllowLR
// //
this.AllowLR.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.AllowLR.AutoSize = true; this.AllowLR.AutoSize = true;
this.AllowLR.Location = new System.Drawing.Point(261, 286); this.AllowLR.Location = new System.Drawing.Point(261, 286);
this.AllowLR.Name = "AllowLR"; this.AllowLR.Name = "AllowLR";

15
BizHawk.MultiClient/config/InputWidget.cs
View File

@ -87,12 +87,7 @@ namespace BizHawk.MultiClient
{ {
// Convert Windows key names to SlimDX key names // Convert Windows key names to SlimDX key names
string str = ""; string str = "";
if((modifiers & Keys.Shift)!=0)
str += "LeftShift + ";
if ((modifiers & Keys.Control) != 0)
str += "LeftControl + ";
if ((modifiers & Keys.Alt) != 0)
str += "LeftAlt + ";
str += key.ToString(); str += key.ToString();
if (str.Length == 2 && str == "Up") if (str.Length == 2 && str == "Up")
str = "UpArrow"; str = "UpArrow";
@ -134,6 +129,14 @@ namespace BizHawk.MultiClient
//Oem Removed now removed from these but they still need conversion //Oem Removed now removed from these but they still need conversion
if (str.Length == 12 && str.Substring(0, 12) == "OpenBrackets") if (str.Length == 12 && str.Substring(0, 12) == "OpenBrackets")
str = "LeftBracket"; str = "LeftBracket";
if ((modifiers & Keys.Shift) != 0)
str = str.Insert(0, "LeftShift + ");
if ((modifiers & Keys.Control) != 0)
str = str.Insert(0, "LeftControl + ");
if ((modifiers & Keys.Alt) != 0)
str = str.Insert(0, "LeftAlt + ");
return str; return str;
} }
public Keys key; public Keys key;