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

ButtonSchema - lock down setting of Name property

This commit is contained in:
adelikat 2020-03-22 14:36:57 -05:00
parent c0ffe0e0e3
commit 7e9ef33d90
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/A78Schema.cs
View File

@ -126,9 +126,8 @@ namespace BizHawk.Client.EmuHawk
MaxSize = new Size(356, 290),
Buttons = new[]
{
new TargetedPairSchema(14, 17)
new TargetedPairSchema(14, 17, $"P{controller} VPos")
{
Name = $"P{controller} VPos",
TargetSize = new Size(256, 240),
SecondaryNames = new[]
{

2
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/ButtonSchema.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Client.EmuHawk
{
}
public string Name { get; set; }
public string Name { get; protected set; }
public string DisplayName { get; set; }
public PadInputType Type { get; protected set; } = PadInputType.Boolean;
public Point Location { get; protected set; }

12
BizHawk.Client.EmuHawk/tools/VirtualPads/schema/SaturnSchema.cs
View File

@ -157,9 +157,8 @@ namespace BizHawk.Client.EmuHawk
{
DisplayName = "Z"
},
new AnalogSchema(6, 74)
new AnalogSchema(6, 74, $"P{controller} Stick Horizontal")
{
Name = $"P{controller} Stick Horizontal",
SecondaryNames = new[] { $"P{controller} Stick Vertical" },
AxisRange = axisRanges[0],
SecondaryAxisRange = axisRanges[1],
@ -308,9 +307,8 @@ namespace BizHawk.Client.EmuHawk
{
DisplayName = "C"
},
new AnalogSchema(185, 13)
new AnalogSchema(185, 13, $"P{controller} Stick Horizontal")
{
Name = $"P{controller} Stick Horizontal",
SecondaryNames = new[] { $"P{controller} Stick Vertical" },
AxisRange = axisRanges[0],
SecondaryAxisRange = axisRanges[1]
@ -336,9 +334,8 @@ namespace BizHawk.Client.EmuHawk
DefaultSize = new Size(680, 230),
Buttons = new ButtonSchema[]
{
new AnalogSchema(58, 13)
new AnalogSchema(58, 13, $"P{controller} Left Stick Horizontal")
{
Name = $"P{controller} Left Stick Horizontal",
SecondaryNames = new[] { $"P{controller} Left Stick Vertical" },
AxisRange = axisRanges[3],
SecondaryAxisRange = axisRanges[4]
@ -351,9 +348,8 @@ namespace BizHawk.Client.EmuHawk
MaxValue = 255,
Orientation = Orientation.Vertical
},
new AnalogSchema(400, 13)
new AnalogSchema(400, 13, $"P{controller} Right Stick Horizontal")
{
Name = $"P{controller} Right Stick Horizontal",
SecondaryNames = new[] { $"P{controller} Right Stick Vertical" },
AxisRange = axisRanges[0],
SecondaryAxisRange = axisRanges[1]