GBA virtual pad fix up

This commit is contained in:
adelikat 2014-06-28 16:13:58 +00:00
parent 92bf602a70
commit 49ef408f06
1 changed files with 33 additions and 11 deletions

View File

@ -12,13 +12,15 @@ namespace BizHawk.Client.EmuHawk
public IEnumerable<PadSchema> GetPadSchemas() public IEnumerable<PadSchema> GetPadSchemas()
{ {
yield return StandardController(1); yield return StandardController(1);
yield return ConsoleButtons();
} }
public static PadSchema StandardController(int controller) public static PadSchema StandardController(int controller)
{ {
return new PadSchema return new PadSchema
{ {
IsConsole = false, IsConsole = false,
DefaultSize = new Size(194, 74), DefaultSize = new Size(194, 90),
Buttons = new[] Buttons = new[]
{ {
new PadSchema.ButtonScema new PadSchema.ButtonScema
@ -26,7 +28,7 @@ namespace BizHawk.Client.EmuHawk
Name = "P" + controller + " Up", Name = "P" + controller + " Up",
DisplayName = "", DisplayName = "",
Icon = Properties.Resources.BlueUp, Icon = Properties.Resources.BlueUp,
Location = new Point(14, 2), Location = new Point(29, 17),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
@ -34,7 +36,7 @@ namespace BizHawk.Client.EmuHawk
Name = "P" + controller + " Down", Name = "P" + controller + " Down",
DisplayName = "", DisplayName = "",
Icon = Properties.Resources.BlueDown, Icon = Properties.Resources.BlueDown,
Location = new Point(14, 46), Location = new Point(29, 61),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
@ -42,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
Name = "P" + controller + " Left", Name = "P" + controller + " Left",
DisplayName = "", DisplayName = "",
Icon = Properties.Resources.Back, Icon = Properties.Resources.Back,
Location = new Point(2, 24), Location = new Point(17, 39),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
@ -50,49 +52,69 @@ namespace BizHawk.Client.EmuHawk
Name = "P" + controller + " Right", Name = "P" + controller + " Right",
DisplayName = "", DisplayName = "",
Icon = Properties.Resources.Forward, Icon = Properties.Resources.Forward,
Location = new Point(24, 24), Location = new Point(39, 39),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
{ {
Name = "P" + controller + " B", Name = "P" + controller + " B",
DisplayName = "B", DisplayName = "B",
Location = new Point(122, 24), Location = new Point(130, 39),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
{ {
Name = "P" + controller + " A", Name = "P" + controller + " A",
DisplayName = "A", DisplayName = "A",
Location = new Point(146, 24), Location = new Point(154, 39),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
{ {
Name = "P" + controller + " Select", Name = "P" + controller + " Select",
DisplayName = "s", DisplayName = "s",
Location = new Point(52, 24), Location = new Point(64, 39),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
{ {
Name = "P" + controller + " Start", Name = "P" + controller + " Start",
DisplayName = "S", DisplayName = "S",
Location = new Point(74, 24), Location = new Point(86, 39),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
{ {
Name = "P" + controller + " L", Name = "P" + controller + " L",
DisplayName = "L", DisplayName = "L",
Location = new Point(2, 2), Location = new Point(2, 12),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
}, },
new PadSchema.ButtonScema new PadSchema.ButtonScema
{ {
Name = "P" + controller + " R", Name = "P" + controller + " R",
DisplayName = "R", DisplayName = "R",
Location = new Point(166, 2), Location = new Point(166, 12),
Type = PadSchema.PadInputType.Boolean
}
}
};
}
private static PadSchema ConsoleButtons()
{
return new PadSchema
{
DisplayName = "Console",
IsConsole = true,
DefaultSize = new Size(75, 50),
Buttons = new[]
{
new PadSchema.ButtonScema
{
Name = "Power",
DisplayName = "Power",
Location = new Point(10, 15),
Type = PadSchema.PadInputType.Boolean Type = PadSchema.PadInputType.Boolean
} }
} }