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

Add trailing commas to object initialisers and `with` expressions

This commit is contained in:
YoshiRulz 2025-03-29 05:42:04 +10:00
parent 613ff73a5a
commit ba12785fe2
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
129 changed files with 298 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ExternalProjects/BizHawk.SrcGen.VersionInfo/VersionInfoGenerator.cs
View File

@ -17,7 +17,7 @@ public class VersionInfoGenerator : ISourceGenerator
{ {
RedirectStandardOutput = true, RedirectStandardOutput = true,
CreateNoWindow = true, CreateNoWindow = true,
UseShellExecute = false // this is just required for visual studio (: UseShellExecute = false, // this is just required for visual studio (:
}; };
try try
{ {

14
ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs
View File

@ -47,7 +47,7 @@ namespace BizHawk.Experiment.AutoGenConfig
Location = new Point(4, 4), Location = new Point(4, 4),
Padding = new Padding(0, 4, 0, 0), Padding = new Padding(0, 4, 0, 0),
Size = new Size(ClientSize.Width - 8, 24), Size = new Size(ClientSize.Width - 8, 24),
WrapContents = false WrapContents = false,
}); });
Controls.Add(GroupUIs[string.Empty] = new FlowLayoutPanel { Controls.Add(GroupUIs[string.Empty] = new FlowLayoutPanel {
Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right, Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right,
@ -55,11 +55,11 @@ namespace BizHawk.Experiment.AutoGenConfig
FlowDirection = FlowDirection.TopDown, FlowDirection = FlowDirection.TopDown,
Location = new Point(4, 32), Location = new Point(4, 32),
Size = new Size(ClientSize.Width - 8, ClientSize.Height - 64), Size = new Size(ClientSize.Width - 8, ClientSize.Height - 64),
WrapContents = false WrapContents = false,
}); });
var discardButton = new Button { var discardButton = new Button {
Size = new Size(128, 24), Size = new Size(128, 24),
Text = "Discard Changes" Text = "Discard Changes",
}.Also(it => it.Click += (clickEventSender, clickEventArgs) => Close()); }.Also(it => it.Click += (clickEventSender, clickEventArgs) => Close());
Controls.Add(new FlowLayoutPanel { Controls.Add(new FlowLayoutPanel {
Anchor = AnchorStyles.Bottom | AnchorStyles.Right, Anchor = AnchorStyles.Bottom | AnchorStyles.Right,
@ -68,7 +68,7 @@ namespace BizHawk.Experiment.AutoGenConfig
Controls = { Controls = {
new Button { new Button {
Size = new Size(128, 24), Size = new Size(128, 24),
Text = "Review and Save..." Text = "Review and Save...",
}.Also(it => it.Click += (clickEventSender, clickEventArgs) => }.Also(it => it.Click += (clickEventSender, clickEventArgs) =>
{ {
var state = GroupUIs.Values.SelectMany(group => group.Controls.Cast<Control>()) var state = GroupUIs.Values.SelectMany(group => group.Controls.Cast<Control>())
@ -104,7 +104,7 @@ namespace BizHawk.Experiment.AutoGenConfig
discardButton, discardButton,
}, },
Location = new Point(ClientSize.Width - 201, ClientSize.Height - 31), Location = new Point(ClientSize.Width - 201, ClientSize.Height - 31),
WrapContents = false WrapContents = false,
}); });
KeyDown += (keyDownEventSender, keyDownEventArgs) => KeyDown += (keyDownEventSender, keyDownEventArgs) =>
{ {
@ -127,11 +127,11 @@ namespace BizHawk.Experiment.AutoGenConfig
AutoSize = true, AutoSize = true,
Dock = DockStyle.Fill, Dock = DockStyle.Fill,
FlowDirection = FlowDirection.TopDown, FlowDirection = FlowDirection.TopDown,
WrapContents = false WrapContents = false,
}.Also(it => GroupUIs[$"{nesting}/{fi.Name}"] = it), }.Also(it => GroupUIs[$"{nesting}/{fi.Name}"] = it),
}, },
Size = new Size(560, 300), Size = new Size(560, 300),
Text = fi.Name Text = fi.Name,
}); });
} }
var config = (APIs.Emulation as EmulationApi ?? throw new Exception("required API wasn't fulfilled")).ForbiddenConfigReference; var config = (APIs.Emulation as EmulationApi ?? throw new Exception("required API wasn't fulfilled")).ForbiddenConfigReference;

12
ExternalToolProjects/AutoGenConfig/ConfigEditorUIGenerators.cs
View File

@ -55,7 +55,7 @@ namespace BizHawk.Experiment.AutoGenConfig
ForeColor = GetUnchangedComparisonColor(nestedName, in baseline, tag), ForeColor = GetUnchangedComparisonColor(nestedName, in baseline, tag),
Name = nestedName, Name = nestedName,
Tag = tag, Tag = tag,
Text = GetPropertyNameDesc(pi) Text = GetPropertyNameDesc(pi),
}.Also(it => it.CheckedChanged += ControlEventHandler); }.Also(it => it.CheckedChanged += ControlEventHandler);
} }
@ -319,7 +319,7 @@ namespace BizHawk.Experiment.AutoGenConfig
Maximum = int.MaxValue, Maximum = int.MaxValue,
Minimum = int.MinValue, Minimum = int.MinValue,
Size = new Size(72, 20), Size = new Size(72, 20),
Value = baseline Value = baseline,
}.Also(it => }.Also(it =>
{ {
if (pi.GetCustomAttributes(typeof(RangeAttribute), false).FirstOrDefault() is RangeAttribute range) if (pi.GetCustomAttributes(typeof(RangeAttribute), false).FirstOrDefault() is RangeAttribute range)
@ -332,7 +332,7 @@ namespace BizHawk.Experiment.AutoGenConfig
}, },
ForeColor = GetUnchangedComparisonColor(nestedName, in baseline, tag), ForeColor = GetUnchangedComparisonColor(nestedName, in baseline, tag),
Name = nestedName, Name = nestedName,
Tag = tag Tag = tag,
}; };
} }
@ -366,7 +366,7 @@ namespace BizHawk.Experiment.AutoGenConfig
}, },
ForeColor = GetUnchangedComparisonColor(nestedName, baseline, tag), ForeColor = GetUnchangedComparisonColor(nestedName, baseline, tag),
Name = nestedName, Name = nestedName,
Tag = tag Tag = tag,
}; };
} }
@ -389,13 +389,13 @@ namespace BizHawk.Experiment.AutoGenConfig
AutoSize = true, AutoSize = true,
Controls = { new Label { AutoSize = true, Text = $"no editor found for type {pi.PropertyType}" } }, Controls = { new Label { AutoSize = true, Text = $"no editor found for type {pi.PropertyType}" } },
Location = new Point(4, 16), Location = new Point(4, 16),
MaximumSize = new Size(int.MaxValue, 20) MaximumSize = new Size(int.MaxValue, 20),
}, },
}, },
MaximumSize = new Size(int.MaxValue, 40), MaximumSize = new Size(int.MaxValue, 40),
Name = $"{nesting}/{pi.Name}", Name = $"{nesting}/{pi.Name}",
Tag = new ConfigPropEditorUITag(metadata, this), Tag = new ConfigPropEditorUITag(metadata, this),
Text = pi.Name Text = pi.Name,
}; };
protected override object? GetTValue(GroupBox c) => throw new InvalidOperationException(); protected override object? GetTValue(GroupBox c) => throw new InvalidOperationException();

4
ExternalToolProjects/DATParser/CustomMainForm.cs
View File

@ -44,11 +44,11 @@ namespace BizHawk.DATTool
Controls = { Controls = {
btnDATConv, btnDATConv,
CreateArgsLabel("Parse External DAT Files (NoIntro / TOSEC)"), CreateArgsLabel("Parse External DAT Files (NoIntro / TOSEC)"),
} },
}, },
}, },
Dock = DockStyle.Fill, Dock = DockStyle.Fill,
FlowDirection = FlowDirection.TopDown FlowDirection = FlowDirection.TopDown,
}); });
ResumeLayout(); ResumeLayout();
} }

10
ExternalToolProjects/DBMan/CustomMainForm.cs
View File

@ -69,7 +69,7 @@ namespace BizHawk.DBManTool
btnDiscHash, btnDiscHash,
CreateArgsLabel("DBMan.exe --dischash"), CreateArgsLabel("DBMan.exe --dischash"),
tbDiscHashArgs, tbDiscHashArgs,
} },
}, },
new FlowLayoutPanel { new FlowLayoutPanel {
AutoSize = true, AutoSize = true,
@ -77,7 +77,7 @@ namespace BizHawk.DBManTool
btnPSXDB, btnPSXDB,
CreateArgsLabel("DBMan.exe --psxdb"), CreateArgsLabel("DBMan.exe --psxdb"),
tbPSXDBArgs, tbPSXDBArgs,
} },
}, },
new FlowLayoutPanel { new FlowLayoutPanel {
AutoSize = true, AutoSize = true,
@ -85,7 +85,7 @@ namespace BizHawk.DBManTool
btnDBMan, btnDBMan,
CreateArgsLabel("DBMan.exe --dbman"), CreateArgsLabel("DBMan.exe --dbman"),
}, },
Enabled = !OSTailoredCode.IsUnixHost Enabled = !OSTailoredCode.IsUnixHost,
}, },
new FlowLayoutPanel { new FlowLayoutPanel {
AutoSize = true, AutoSize = true,
@ -94,11 +94,11 @@ namespace BizHawk.DBManTool
CreateArgsLabel("DBMan.exe --disccmp"), CreateArgsLabel("DBMan.exe --disccmp"),
tbDiscCMPArgs, tbDiscCMPArgs,
}, },
Enabled = false Enabled = false,
}, },
}, },
Dock = DockStyle.Fill, Dock = DockStyle.Fill,
FlowDirection = FlowDirection.TopDown FlowDirection = FlowDirection.TopDown,
}); });
ResumeLayout(); ResumeLayout();
} }

2
ExternalToolProjects/DBMan/PsxDBJob.cs
View File

@ -115,7 +115,7 @@ namespace BizHawk.DBManTool
Records.Add(new RedumpRecord() Records.Add(new RedumpRecord()
{ {
name = name, name = name,
crc = spec_crc_calc.Current.ToString("X8") crc = spec_crc_calc.Current.ToString("X8"),
}); });
} }
} }

2
src/BizHawk.Bizware.Graphics.Controls/Controls/GDIPlusControl.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Bizware.Graphics.Controls
return new(graphics, ClientRectangle with return new(graphics, ClientRectangle with
{ {
Width = Math.Max(ClientRectangle.Width, 1), Width = Math.Max(ClientRectangle.Width, 1),
Height = Math.Max(ClientRectangle.Height, 1) Height = Math.Max(ClientRectangle.Height, 1),
}); });
} }

2
src/BizHawk.Bizware.Graphics/BitmapBuffer.cs
View File

@ -61,7 +61,7 @@ namespace BizHawk.Bizware.Graphics
Height = Height, Height = Height,
Width = Width, Width = Width,
Stride = Width * 4, Stride = Width * 4,
Scan0 = CurrLockHandle.AddrOfPinnedObject() Scan0 = CurrLockHandle.AddrOfPinnedObject(),
}; };
return CurrLock; return CurrLock;

2
src/BizHawk.Bizware.Graphics/GDIPlus/GDIPlusTexture2D.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Bizware.Graphics
{ {
var blo = new BitmapLoadOptions var blo = new BitmapLoadOptions
{ {
AllowWrap = false // must be an independent resource AllowWrap = false, // must be an independent resource
}; };
return new(SDBitmap, blo); return new(SDBitmap, blo);

2
src/BizHawk.Client.Common/DisplayManager/DisplayManagerBase.cs
View File

@ -476,7 +476,7 @@ namespace BizHawk.Client.Common
Simulate = displayNothing, Simulate = displayNothing,
ChainOutsize = GetGraphicsControlSize(), ChainOutsize = GetGraphicsControlSize(),
IncludeOSD = true, IncludeOSD = true,
IncludeUserFilters = true IncludeUserFilters = true,
}; };
UpdateSourceInternal(job); UpdateSourceInternal(job);

2
src/BizHawk.Client.Common/DisplayManager/Filters/BaseFilter.cs
View File

@ -139,7 +139,7 @@ namespace BizHawk.Client.Common.Filters
{ {
SurfaceDirection = direction, SurfaceDirection = direction,
Channel = channel, Channel = channel,
SurfaceDisposition = disposition SurfaceDisposition = disposition,
}; };
_ioSurfaceInfos.Add(iosi); _ioSurfaceInfos.Add(iosi);

4
src/BizHawk.Client.Common/DisplayManager/OSDManager.cs
View File

@ -103,7 +103,7 @@ namespace BizHawk.Client.Common
Message = message, Message = message,
Position = pos, Position = pos,
BackGround = backGround, BackGround = backGround,
ForeColor = foreColor ForeColor = foreColor,
}); });
} }
@ -114,7 +114,7 @@ namespace BizHawk.Client.Common
Message = message, Message = message,
Position = pos, Position = pos,
BackGround = backGround, BackGround = backGround,
ForeColor = foreColor ForeColor = foreColor,
}); });
} }

8
src/BizHawk.Client.Common/QuickBmpFile.cs
View File

@ -197,13 +197,13 @@ namespace BizHawk.Client.Common
{ {
Data = srcp, Data = srcp,
Width = src.BufferWidth, Width = src.BufferWidth,
Height = src.BufferHeight Height = src.BufferHeight,
}, },
new BMP new BMP
{ {
Data = dstp, Data = dstp,
Width = dst.BufferWidth, Width = dst.BufferWidth,
Height = dst.BufferHeight Height = dst.BufferHeight,
}); });
} }
} }
@ -271,7 +271,7 @@ namespace BizHawk.Client.Common
{ {
Data = (int*)srcp, Data = (int*)srcp,
Width = inW, Width = inW,
Height = inH Height = inH,
}, },
new BMP new BMP
{ {
@ -317,7 +317,7 @@ namespace BizHawk.Client.Common
{ {
Data = srcp, Data = srcp,
Width = v.BufferWidth, Width = v.BufferWidth,
Height = v.BufferHeight Height = v.BufferHeight,
}, },
new BMP new BMP
{ {

2
src/BizHawk.Client.Common/RomGame.cs
View File

@ -60,7 +60,7 @@ namespace BizHawk.Client.Common
System = VSystemID.Raw.N3DS, System = VSystemID.Raw.N3DS,
Hash = "N/A", Hash = "N/A",
Status = RomStatus.NotInDatabase, Status = RomStatus.NotInDatabase,
NotInDatabase = true NotInDatabase = true,
}; };
#pragma warning disable CA1862 // testing whether it's all-caps #pragma warning disable CA1862 // testing whether it's all-caps

12
src/BizHawk.Client.Common/RomLoader.cs
View File

@ -342,7 +342,7 @@ namespace BizHawk.Client.Common
{ {
DiscData = disc, DiscData = disc,
DiscType = new DiscIdentifier(disc).DetectDiscType(), DiscType = new DiscIdentifier(disc).DetectDiscType(),
DiscName = Path.GetFileNameWithoutExtension(path) DiscName = Path.GetFileNameWithoutExtension(path),
}, },
}, },
}; };
@ -368,7 +368,7 @@ namespace BizHawk.Client.Common
{ {
DiscData = a.d, DiscData = a.d,
DiscType = new DiscIdentifier(a.d).DetectDiscType(), DiscType = new DiscIdentifier(a.d).DetectDiscType(),
DiscName = Path.GetFileNameWithoutExtension(a.p) DiscName = Path.GetFileNameWithoutExtension(a.p),
}) })
.ToList(); .ToList();
if (discs.Count == 0) if (discs.Count == 0)
@ -379,7 +379,7 @@ namespace BizHawk.Client.Common
{ {
Comm = nextComm, Comm = nextComm,
Game = game, Game = game,
Discs = discs Discs = discs,
}; };
nextEmulator = MakeCoreFromCoreInventory(cip, forcedCoreName); nextEmulator = MakeCoreFromCoreInventory(cip, forcedCoreName);
} }
@ -560,7 +560,7 @@ namespace BizHawk.Client.Common
FileData = rom.FileData, FileData = rom.FileData,
Extension = rom.Extension, Extension = rom.Extension,
RomPath = file.FullPathWithoutMember, RomPath = file.FullPathWithoutMember,
Game = game Game = game,
}, },
}, },
}; };
@ -689,7 +689,7 @@ namespace BizHawk.Client.Common
FileData = kvp.Value, // TODO: Hope no one needed anything special here FileData = kvp.Value, // TODO: Hope no one needed anything special here
Extension = Path.GetExtension(kvp.Key), Extension = Path.GetExtension(kvp.Key),
RomPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(path.SubstringBefore('|'))!, kvp.Key!)), RomPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(path.SubstringBefore('|'))!, kvp.Key!)),
Game = Database.GetGameInfo(kvp.Value, Path.GetFileName(kvp.Key)) Game = Database.GetGameInfo(kvp.Value, Path.GetFileName(kvp.Key)),
}) })
.ToList(), .ToList(),
Discs = xmlGame.AssetFullPaths Discs = xmlGame.AssetFullPaths
@ -700,7 +700,7 @@ namespace BizHawk.Client.Common
{ {
DiscData = a.d, DiscData = a.d,
DiscType = new DiscIdentifier(a.d).DetectDiscType(), DiscType = new DiscIdentifier(a.d).DetectDiscType(),
DiscName = Path.GetFileNameWithoutExtension(a.p) DiscName = Path.GetFileNameWithoutExtension(a.p),
}) })
.ToList(), .ToList(),
}; };

2
src/BizHawk.Client.Common/Sound/Utilities/SyncToAsyncProvider.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Client.Common
{ {
_outputProvider = new SoundOutputProvider(getCoreVsyncRateCallback, standaloneMode: true) _outputProvider = new SoundOutputProvider(getCoreVsyncRateCallback, standaloneMode: true)
{ {
BaseSoundProvider = baseProvider BaseSoundProvider = baseProvider,
}; };
} }

4
src/BizHawk.Client.Common/XmlGame.cs
View File

@ -37,9 +37,9 @@ namespace BizHawk.Client.Common
{ {
System = y.Attributes!["System"].Value, System = y.Attributes!["System"].Value,
Name = y.Attributes["Name"].Value, Name = y.Attributes["Name"].Value,
Status = RomStatus.Unknown Status = RomStatus.Unknown,
}, },
Xml = x Xml = x,
}; };
var fullPath = ""; var fullPath = "";

2
src/BizHawk.Client.Common/cheats/GbaGameSharkDecoder.cs
View File

@ -71,7 +71,7 @@ namespace BizHawk.Client.Common.cheats
'3' => WatchSize.DWord, '3' => WatchSize.DWord,
'6' => WatchSize.Word, '6' => WatchSize.Word,
_ => WatchSize.Byte, _ => WatchSize.Byte,
} },
}; };
result.Address = int.Parse(GetLast(code, (int)result.Size), NumberStyles.HexNumber); result.Address = int.Parse(GetLast(code, (int)result.Size), NumberStyles.HexNumber);

2
src/BizHawk.Client.Common/cheats/N64GameSharkDecoder.cs
View File

@ -61,7 +61,7 @@ namespace BizHawk.Client.Common.cheats
_ => WatchSize.Byte, _ => WatchSize.Byte,
}, },
Address = int.Parse(s.Remove(6, 5), NumberStyles.HexNumber), Address = int.Parse(s.Remove(6, 5), NumberStyles.HexNumber),
Value = int.Parse(s.Remove(0, 7), NumberStyles.HexNumber) Value = int.Parse(s.Remove(0, 7), NumberStyles.HexNumber),
}; };
} }
} }

2
src/BizHawk.Client.Common/cheats/SnesActionReplayDecoder.cs
View File

@ -24,7 +24,7 @@ namespace BizHawk.Client.Common.cheats
{ {
Size = WatchSize.Byte, Size = WatchSize.Byte,
Address = int.Parse(code.Remove(6, 2), NumberStyles.HexNumber), Address = int.Parse(code.Remove(6, 2), NumberStyles.HexNumber),
Value = int.Parse(code.Remove(0, 6), NumberStyles.HexNumber) Value = int.Parse(code.Remove(0, 6), NumberStyles.HexNumber),
}; };
} }
} }

2
src/BizHawk.Client.Common/config/ConfigService.cs
View File

@ -28,7 +28,7 @@ namespace BizHawk.Client.Common
ContractResolver = new DefaultContractResolver ContractResolver = new DefaultContractResolver
{ {
DefaultMembersSearchFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic DefaultMembersSearchFlags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.NonPublic,
}, },
}; };
} }

4
src/BizHawk.Client.Common/fwmanager/FirmwareManager.cs
View File

@ -61,7 +61,7 @@ namespace BizHawk.Client.Common
FilePath = patchedFilePath, FilePath = patchedFilePath,
KnownFirmwareFile = ff, KnownFirmwareFile = ff,
Hash = patchOption.Value.TargetHash, Hash = patchOption.Value.TargetHash,
Size = patchedFileLength Size = patchedFileLength,
}; };
} }
@ -170,7 +170,7 @@ namespace BizHawk.Client.Common
FilePath = reader.Dict[fo.Hash].FileInfo.FullName, FilePath = reader.Dict[fo.Hash].FileInfo.FullName,
KnownFirmwareFile = FirmwareDatabase.FirmwareFilesByHash[fo.Hash], KnownFirmwareFile = FirmwareDatabase.FirmwareFilesByHash[fo.Hash],
Hash = fo.Hash, Hash = fo.Hash,
Size = fo.Size Size = fo.Size,
}; };
} }

6
src/BizHawk.Client.Common/inputAdapters/IInputAdapter.cs
View File

@ -21,7 +21,7 @@ namespace BizHawk.Client.Common
return new AndAdapter return new AndAdapter
{ {
Source = source, Source = source,
SourceAnd = target SourceAnd = target,
}; };
} }
@ -33,7 +33,7 @@ namespace BizHawk.Client.Common
return new XorAdapter return new XorAdapter
{ {
Source = source, Source = source,
SourceXor = target SourceXor = target,
}; };
} }
@ -46,7 +46,7 @@ namespace BizHawk.Client.Common
return new ORAdapter return new ORAdapter
{ {
Source = source, Source = source,
SourceOr = target SourceOr = target,
}; };
} }
} }

2
src/BizHawk.Client.Common/lua/LuaDocumentation.cs
View File

@ -141,7 +141,7 @@ namespace BizHawk.Client.Common
{ {
var completion = new SublimeCompletions.Completion var completion = new SublimeCompletions.Completion
{ {
Trigger = $"{f.Library}.{f.Name}" Trigger = $"{f.Library}.{f.Name}",
}; };
var sb = new StringBuilder(); var sb = new StringBuilder();

2
src/BizHawk.Client.Common/movie/SubtitleList.cs
View File

@ -50,7 +50,7 @@ namespace BizHawk.Client.Common
Y = int.Parse(subParts[3]), Y = int.Parse(subParts[3]),
Duration = int.Parse(subParts[4]), Duration = int.Parse(subParts[4]),
Color = uint.Parse(subParts[5], NumberStyles.HexNumber), Color = uint.Parse(subParts[5], NumberStyles.HexNumber),
Message = message.Trim() Message = message.Trim(),
}); });
return true; return true;

2
src/BizHawk.Client.Common/movie/import/DsmImport.cs
View File

@ -34,7 +34,7 @@ namespace BizHawk.Client.Common
"Touch", "Touch",
"Microphone", "Microphone",
"Power", "Power",
} },
}.AddXYPair("Touch {0}", AxisPairOrientation.RightAndUp, 0.RangeTo(255), 128, 0.RangeTo(191), 96) //TODO verify direction against hardware }.AddXYPair("Touch {0}", AxisPairOrientation.RightAndUp, 0.RangeTo(255), 128, 0.RangeTo(191), 96) //TODO verify direction against hardware
.AddAxis("Mic Volume", 0.RangeTo(100), 100) .AddAxis("Mic Volume", 0.RangeTo(100), 100)
.AddAxis("GBA Light Sensor", 0.RangeTo(10), 0) .AddAxis("GBA Light Sensor", 0.RangeTo(10), 0)

2
src/BizHawk.Client.Common/movie/import/FcmImport.cs
View File

@ -34,7 +34,7 @@ namespace BizHawk.Client.Common.movie.import
var controllerSettings = new NESControlSettings var controllerSettings = new NESControlSettings
{ {
NesLeftPort = nameof(ControllerNES), NesLeftPort = nameof(ControllerNES),
NesRightPort = nameof(ControllerNES) NesRightPort = nameof(ControllerNES),
}; };
_deck = controllerSettings.Instantiate((x, y) => true).AddSystemToControllerDef(); _deck = controllerSettings.Instantiate((x, y) => true).AddSystemToControllerDef();
_deck.ControllerDef.BuildMnemonicsCache(Result.Movie.SystemID); _deck.ControllerDef.BuildMnemonicsCache(Result.Movie.SystemID);

2
src/BizHawk.Client.Common/movie/import/Fm2Import.cs
View File

@ -23,7 +23,7 @@ namespace BizHawk.Client.Common
var controllerSettings = new NESControlSettings var controllerSettings = new NESControlSettings
{ {
NesLeftPort = nameof(UnpluggedNES), NesLeftPort = nameof(UnpluggedNES),
NesRightPort = nameof(UnpluggedNES) NesRightPort = nameof(UnpluggedNES),
}; };
bool isFourScore = false; bool isFourScore = false;

2
src/BizHawk.Client.Common/movie/import/FmvImport.cs
View File

@ -91,7 +91,7 @@ namespace BizHawk.Client.Common.movie.import
var controllerSettings = new NESControlSettings var controllerSettings = new NESControlSettings
{ {
NesLeftPort = controller1 ? nameof(ControllerNES) : nameof(UnpluggedNES), NesLeftPort = controller1 ? nameof(ControllerNES) : nameof(UnpluggedNES),
NesRightPort = controller2 ? nameof(ControllerNES) : nameof(UnpluggedNES) NesRightPort = controller2 ? nameof(ControllerNES) : nameof(UnpluggedNES),
}; };
_deck = controllerSettings.Instantiate((x, y) => true).AddSystemToControllerDef(); _deck = controllerSettings.Instantiate((x, y) => true).AddSystemToControllerDef();
_deck.ControllerDef.BuildMnemonicsCache(Result.Movie.SystemID); _deck.ControllerDef.BuildMnemonicsCache(Result.Movie.SystemID);

2
src/BizHawk.Client.Common/movie/import/GmvImport.cs
View File

@ -80,7 +80,7 @@ namespace BizHawk.Client.Common.movie.import
{ {
UseSixButton = useSixButtons, UseSixButton = useSixButtons,
ControlTypeLeft = GPGX.ControlType.Normal, ControlTypeLeft = GPGX.ControlType.Normal,
ControlTypeRight = GPGX.ControlType.Normal ControlTypeRight = GPGX.ControlType.Normal,
}; };
input.dev[2] = input.dev[3] = input.dev[4] = input.dev[5] = input.dev[6] = input.dev[7] = LibGPGX.INPUT_DEVICE.DEVICE_NONE; input.dev[2] = input.dev[3] = input.dev[4] = input.dev[5] = input.dev[6] = input.dev[7] = LibGPGX.INPUT_DEVICE.DEVICE_NONE;

2
src/BizHawk.Client.Common/movie/import/Mc2Import.cs
View File

@ -19,7 +19,7 @@ namespace BizHawk.Client.Common.movie.import
Port2 = PceControllerType.Unplugged, Port2 = PceControllerType.Unplugged,
Port3 = PceControllerType.Unplugged, Port3 = PceControllerType.Unplugged,
Port4 = PceControllerType.Unplugged, Port4 = PceControllerType.Unplugged,
Port5 = PceControllerType.Unplugged Port5 = PceControllerType.Unplugged,
}; };
_deck = new PceControllerDeck( _deck = new PceControllerDeck(

4
src/BizHawk.Client.Common/movie/import/PjmImport.cs
View File

@ -139,8 +139,8 @@ namespace BizHawk.Client.Common
OctoshockDll.ePeripheralType.None, OctoshockDll.ePeripheralType.None,
OctoshockDll.ePeripheralType.None, OctoshockDll.ePeripheralType.None,
OctoshockDll.ePeripheralType.None, OctoshockDll.ePeripheralType.None,
} },
} },
}; };
movie.SyncSettingsJson = ConfigService.SaveWithType(syncSettings); movie.SyncSettingsJson = ConfigService.SaveWithType(syncSettings);

2
src/BizHawk.Client.Common/movie/import/VbmImport.cs
View File

@ -306,7 +306,7 @@ namespace BizHawk.Client.Common.movie.import
private static SimpleController GbController() private static SimpleController GbController()
=> new(new ControllerDefinition("Gameboy Controller") => new(new ControllerDefinition("Gameboy Controller")
{ {
BoolButtons = { "Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Power" } BoolButtons = { "Up", "Down", "Left", "Right", "Start", "Select", "B", "A", "Power" },
}.MakeImmutable()); }.MakeImmutable());
private static SimpleController GbaController() private static SimpleController GbaController()

4
src/BizHawk.Client.Common/movie/import/YmvImport.cs
View File

@ -29,7 +29,7 @@ namespace BizHawk.Client.Common.movie.import
[9] = "none", [9] = "none",
[10] = "none", [10] = "none",
[11] = "none", [11] = "none",
} },
}; };
using var sr = SourceFile.OpenText(); using var sr = SourceFile.OpenText();
@ -110,7 +110,7 @@ namespace BizHawk.Client.Common.movie.import
"P1 Start", "P1 Start",
"P1 A", "P1 B", "P1 C", "P1 X", "P1 Y", "P1 Z", "P1 A", "P1 B", "P1 C", "P1 X", "P1 Y", "P1 Z",
"P1 L", "P1 R", "P1 L", "P1 R",
} },
}.MakeImmutable()); }.MakeImmutable());
controllers.Definition.BuildMnemonicsCache(Result.Movie.SystemID); controllers.Definition.BuildMnemonicsCache(Result.Movie.SystemID);

32
src/BizHawk.Client.Common/movie/import/bkm/BkmMnemonicConstants.cs
View File

@ -14,13 +14,13 @@ namespace BizHawk.Client.Common
{ {
BoolButtons = new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A" }.Select(b => $"P1 {b}") BoolButtons = new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A" }.Select(b => $"P1 {b}")
.Append("Power") .Append("Power")
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.GBA] = new BkmControllerDefinition("GBA Controller") [VSystemID.Raw.GBA] = new BkmControllerDefinition("GBA Controller")
{ {
BoolButtons = new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A", "L", "R" }.Select(b => $"P1 {b}") BoolButtons = new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A", "L", "R" }.Select(b => $"P1 {b}")
.Append("Power") .Append("Power")
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.GEN] = new BkmControllerDefinition("GPGX Genesis Controller") [VSystemID.Raw.GEN] = new BkmControllerDefinition("GPGX Genesis Controller")
{ {
@ -28,7 +28,7 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "A", "B", "C", "Start", "X", "Y", "Z", "Mode" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "A", "B", "C", "Start", "X", "Y", "Z", "Mode" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Power" ]) .Concat([ "Reset", "Power" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.NES] = new BkmControllerDefinition("NES Controller") [VSystemID.Raw.NES] = new BkmControllerDefinition("NES Controller")
{ {
@ -36,7 +36,7 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Power", "FDS Eject", "FDS Insert 0", "FDS Insert 1", "FDS Insert 2", "FDS Insert 3", "VS Coin 1", "VS Coin 2" ]) .Concat([ "Reset", "Power", "FDS Eject", "FDS Insert 0", "FDS Insert 1", "FDS Insert 2", "FDS Insert 3", "VS Coin 1", "VS Coin 2" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.SNES] = new BkmControllerDefinition("SNES Controller") [VSystemID.Raw.SNES] = new BkmControllerDefinition("SNES Controller")
{ {
@ -44,14 +44,14 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A", "X", "Y", "L", "R" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Select", "Start", "B", "A", "X", "Y", "L", "R" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Power" ]) .Concat([ "Reset", "Power" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.PCE] = new BkmControllerDefinition("PC Engine Controller") [VSystemID.Raw.PCE] = new BkmControllerDefinition("PC Engine Controller")
{ {
BoolButtons = Enumerable.Range(1, 5) BoolButtons = Enumerable.Range(1, 5)
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Select", "Run", "B2", "B1" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Select", "Run", "B2", "B1" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.SMS] = new BkmControllerDefinition("SMS Controller") [VSystemID.Raw.SMS] = new BkmControllerDefinition("SMS Controller")
{ {
@ -59,7 +59,7 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "B1", "B2" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "B1", "B2" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Pause", "Reset" ]) .Concat([ "Pause", "Reset" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.TI83] = new BkmControllerDefinition("TI83 Controller") [VSystemID.Raw.TI83] = new BkmControllerDefinition("TI83 Controller")
{ {
@ -70,7 +70,7 @@ namespace BizHawk.Client.Common
"PRGM", "STAT", "MATRIX", "X", "STO", "LN", "LOG", "SQUARED", "NEG1", "PRGM", "STAT", "MATRIX", "X", "STO", "LN", "LOG", "SQUARED", "NEG1",
"MATH", "ALPHA", "GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE", "MATH", "ALPHA", "GRAPH", "TRACE", "ZOOM", "WINDOW", "Y", "2ND", "MODE",
}.Select(b => $"P1 {b}") }.Select(b => $"P1 {b}")
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.A26] = new BkmControllerDefinition("Atari 2600 Basic Controller") [VSystemID.Raw.A26] = new BkmControllerDefinition("Atari 2600 Basic Controller")
{ {
@ -78,7 +78,7 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Button" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Button" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Select" ]) .Concat([ "Reset", "Select" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.A78] = new BkmControllerDefinition("Atari 7800 ProLine Joystick Controller") [VSystemID.Raw.A78] = new BkmControllerDefinition("Atari 7800 ProLine Joystick Controller")
{ {
@ -86,7 +86,7 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Trigger", "Trigger 2" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Trigger", "Trigger 2" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Power", "Select", "Pause" ]) .Concat([ "Reset", "Power", "Select", "Pause" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.C64] = new BkmControllerDefinition("Commodore 64 Controller") [VSystemID.Raw.C64] = new BkmControllerDefinition("Commodore 64 Controller")
{ {
@ -102,7 +102,7 @@ namespace BizHawk.Client.Common
"Key Z", "Key X", "Key C", "Key V", "Key B", "Key N", "Key M", "Key Comma", "Key Period", "Key Z", "Key X", "Key C", "Key V", "Key B", "Key N", "Key M", "Key Comma", "Key Period",
"Key Slash", "Key Right Shift", "Key Cursor Up/Down", "Key Cursor Left/Right", "Key Space" "Key Slash", "Key Right Shift", "Key Cursor Up/Down", "Key Cursor Left/Right", "Key Space"
]) ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.Coleco] = new BkmControllerDefinition("ColecoVision Basic Controller") [VSystemID.Raw.Coleco] = new BkmControllerDefinition("ColecoVision Basic Controller")
{ {
@ -111,7 +111,7 @@ namespace BizHawk.Client.Common
"Key1", "Key2", "Key3", "Key4", "Key5", "Key6", "Key1", "Key2", "Key3", "Key4", "Key5", "Key6",
"Key7", "Key8", "Key9", "Star", "Key0", "Pound", "Key7", "Key8", "Key9", "Star", "Key0", "Pound",
}.Select(b => $"P{i} {b}")) }.Select(b => $"P{i} {b}"))
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.N64] = new BkmControllerDefinition("Nintento 64 Controller") [VSystemID.Raw.N64] = new BkmControllerDefinition("Nintento 64 Controller")
{ {
@ -122,7 +122,7 @@ namespace BizHawk.Client.Common
"C Up", "C Down", "C Left", "C Right", "C Up", "C Down", "C Left", "C Right",
}.Select(b => $"P{i} {b}")) }.Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Power" ]) .Concat([ "Reset", "Power" ])
.ToArray() .ToArray(),
}.AddXYPair("P1 {0} Axis", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0) }.AddXYPair("P1 {0} Axis", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0)
.AddXYPair("P2 {0} Axis", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0) .AddXYPair("P2 {0} Axis", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0)
.AddXYPair("P3 {0} Axis", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0) .AddXYPair("P3 {0} Axis", AxisPairOrientation.RightAndUp, (-128).RangeTo(127), 0)
@ -134,14 +134,14 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Start", "X", "Y", "Z", "A", "B", "C", "L", "R" } .SelectMany(i => new[] { "Up", "Down", "Left", "Right", "Start", "X", "Y", "Z", "A", "B", "C", "L", "R" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Reset", "Power" ]) .Concat([ "Reset", "Power" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
["DGB"] = new BkmControllerDefinition("Dual Gameboy Controller") ["DGB"] = new BkmControllerDefinition("Dual Gameboy Controller")
{ {
BoolButtons = Enumerable.Range(1, 2) BoolButtons = Enumerable.Range(1, 2)
.SelectMany(i => new[] { "Power", "Up", "Down", "Left", "Right", "Select", "Start", "B", "A" } .SelectMany(i => new[] { "Power", "Up", "Down", "Left", "Right", "Select", "Start", "B", "A" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
[VSystemID.Raw.WSWAN] = new BkmControllerDefinition("WonderSwan Controller") [VSystemID.Raw.WSWAN] = new BkmControllerDefinition("WonderSwan Controller")
{ {
@ -149,7 +149,7 @@ namespace BizHawk.Client.Common
.SelectMany(i => new[] { "X1", "X3", "X4", "X2", "Y1", "Y3", "Y4", "Y2", "Start", "B", "A" } .SelectMany(i => new[] { "X1", "X3", "X4", "X2", "Y1", "Y3", "Y4", "Y2", "Start", "B", "A" }
.Select(b => $"P{i} {b}")) .Select(b => $"P{i} {b}"))
.Concat([ "Power", "Rotate" ]) .Concat([ "Power", "Rotate" ])
.ToArray() .ToArray(),
}.MakeImmutable(), }.MakeImmutable(),
}; };
} }

2
src/BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -103,7 +103,7 @@ namespace BizHawk.Client.Common
HasState = TasStateManager.HasState(index), HasState = TasStateManager.HasState(index),
LogEntry = GetInputLogEntry(index), LogEntry = GetInputLogEntry(index),
Lagged = lagged, Lagged = lagged,
WasLagged = LagLog.History(lagIndex) WasLagged = LagLog.History(lagIndex),
}; };
} }
} }

6
src/BizHawk.Client.Common/movie/tasproj/ZwinderStateManagerSettings.cs
View File

@ -119,7 +119,7 @@ namespace BizHawk.Client.Common
UseFixedRewindInterval = false, UseFixedRewindInterval = false,
TargetFrameLength = CurrentTargetFrameLength, TargetFrameLength = CurrentTargetFrameLength,
AllowOutOfOrderStates = false, AllowOutOfOrderStates = false,
BackingStore = CurrentStoreType BackingStore = CurrentStoreType,
}; };
} }
public RewindConfig Recent() public RewindConfig Recent()
@ -131,7 +131,7 @@ namespace BizHawk.Client.Common
UseFixedRewindInterval = false, UseFixedRewindInterval = false,
TargetFrameLength = RecentTargetFrameLength, TargetFrameLength = RecentTargetFrameLength,
AllowOutOfOrderStates = false, AllowOutOfOrderStates = false,
BackingStore = RecentStoreType BackingStore = RecentStoreType,
}; };
} }
public RewindConfig GapFiller() public RewindConfig GapFiller()
@ -143,7 +143,7 @@ namespace BizHawk.Client.Common
UseFixedRewindInterval = false, UseFixedRewindInterval = false,
TargetFrameLength = GapsTargetFrameLength, TargetFrameLength = GapsTargetFrameLength,
AllowOutOfOrderStates = false, AllowOutOfOrderStates = false,
BackingStore = GapsStoreType BackingStore = GapsStoreType,
}; };
} }
} }

2
src/BizHawk.Client.Common/rewind/ZwinderBuffer.cs
View File

@ -380,7 +380,7 @@ namespace BizHawk.Client.Common
TargetFrameLength = targetFrameLength, TargetFrameLength = targetFrameLength,
TargetRewindInterval = 5, TargetRewindInterval = 5,
AllowOutOfOrderStates = false, AllowOutOfOrderStates = false,
UseCompression = useCompression UseCompression = useCompression,
}); });
if (ret.Size != size || ret._sizeMask != sizeMask) if (ret.Size != size || ret._sizeMask != sizeMask)
{ {

2
src/BizHawk.Client.Common/tools/Watch/SeparatorWatch.cs
View File

@ -25,7 +25,7 @@ namespace BizHawk.Client.Common
{ {
return new SeparatorWatch return new SeparatorWatch
{ {
Notes = description Notes = description,
}; };
} }

6
src/BizHawk.Client.EmuHawk/AVOut/AviWriter.cs
View File

@ -264,7 +264,7 @@ namespace BizHawk.Client.EmuHawk
fps_scale = 1, fps_scale = 1,
a_bits = 16, a_bits = 16,
a_samplerate = 44100, a_samplerate = 44100,
a_channels = 2 a_channels = 2,
}; };
var tempSegment = new AviWriterSegment(); var tempSegment = new AviWriterSegment();
@ -434,7 +434,7 @@ namespace BizHawk.Client.EmuHawk
_comprOptions = opts, _comprOptions = opts,
codec = Decode_mmioFOURCC(opts.fccHandler), codec = Decode_mmioFOURCC(opts.fccHandler),
Format = new byte[opts.cbFormat], Format = new byte[opts.cbFormat],
Parms = new byte[opts.cbParms] Parms = new byte[opts.cbParms],
}; };
if (opts.lpFormat != IntPtr.Zero) if (opts.lpFormat != IntPtr.Zero)
@ -551,7 +551,7 @@ namespace BizHawk.Client.EmuHawk
_comprOptions = comprOptions, _comprOptions = comprOptions,
Format = format, Format = format,
Parms = parms, Parms = parms,
codec = Decode_mmioFOURCC(comprOptions.fccHandler) codec = Decode_mmioFOURCC(comprOptions.fccHandler),
}; };
} }

2
src/BizHawk.Client.EmuHawk/AVOut/GifWriter.cs
View File

@ -66,7 +66,7 @@ namespace BizHawk.Client.EmuHawk
return new GifToken(0, 0) return new GifToken(0, 0)
{ {
Frameskip = config.GifWriterFrameskip, Frameskip = config.GifWriterFrameskip,
FrameDelay = config.GifWriterDelay FrameDelay = config.GifWriterDelay,
}; };
} }

2
src/BizHawk.Client.EmuHawk/AVOut/GifWriterForm.cs
View File

@ -15,7 +15,7 @@ namespace BizHawk.Client.EmuHawk
using var dlg = new GifWriterForm using var dlg = new GifWriterForm
{ {
numericUpDown1 = { Value = config.GifWriterFrameskip }, numericUpDown1 = { Value = config.GifWriterFrameskip },
numericUpDown2 = { Value = config.GifWriterDelay } numericUpDown2 = { Value = config.GifWriterDelay },
}; };
dlg.NumericUpDown2_ValueChanged(null, null); dlg.NumericUpDown2_ValueChanged(null, null);

2
src/BizHawk.Client.EmuHawk/AVOut/JMDForm.cs
View File

@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
var j = new JmdForm var j = new JmdForm
{ {
threadsBar = { Minimum = tMin, Maximum = tMax }, threadsBar = { Minimum = tMin, Maximum = tMax },
compressionBar = { Minimum = cMin, Maximum = cMax } compressionBar = { Minimum = cMin, Maximum = cMax },
}; };
j.threadsBar.Value = threads; j.threadsBar.Value = threads;

6
src/BizHawk.Client.EmuHawk/AVOut/JMDWriter.cs
View File

@ -380,7 +380,7 @@ namespace BizHawk.Client.EmuHawk
Stream = 0, Stream = 0,
Subtype = 1,// zlib compressed, other possibility is 0 = uncompressed Subtype = 1,// zlib compressed, other possibility is 0 = uncompressed
Data = source, Data = source,
Timestamp = TimestampCalc(_fpsNum, _fpsDen, _totalFrames) Timestamp = TimestampCalc(_fpsNum, _fpsDen, _totalFrames),
}; };
_totalFrames++; _totalFrames++;
@ -420,7 +420,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Stream = 1, Stream = 1,
Subtype = 1, // raw PCM audio Subtype = 1, // raw PCM audio
Data = new byte[4] Data = new byte[4],
}; };
j.Data[0] = (byte)(l >> 8); j.Data[0] = (byte)(l >> 8);
@ -781,7 +781,7 @@ namespace BizHawk.Client.EmuHawk
GameName = gameName, GameName = gameName,
Authors = authors, Authors = authors,
LengthMs = lengthMs, LengthMs = lengthMs,
Rerecords = rerecords Rerecords = rerecords,
}; };
} }

2
src/BizHawk.Client.EmuHawk/AVOut/NutMuxer.cs
View File

@ -615,7 +615,7 @@ namespace BizHawk.Client.EmuHawk
Width = width, Width = width,
Height = height, Height = height,
FpsNum = fpsNum, FpsNum = fpsNum,
FpsDen = fpsDen FpsDen = fpsDen,
}; };
_avParams.Reduce(); // TimeBases in nut MUST be relatively prime _avParams.Reduce(); // TimeBases in nut MUST be relatively prime

2
src/BizHawk.Client.EmuHawk/AVOut/SynclessRecordingTools.cs
View File

@ -70,7 +70,7 @@ namespace BizHawk.Client.EmuHawk
_mFrameInfos.Add(new FrameInfo _mFrameInfos.Add(new FrameInfo
{ {
PngPath = png, PngPath = png,
WavPath = wav WavPath = wav,
}); });
frame++; frame++;

2
src/BizHawk.Client.EmuHawk/AVOut/VideoWriterChooserForm.cs
View File

@ -69,7 +69,7 @@ namespace BizHawk.Client.EmuHawk
checkBoxPad = { Checked = config.AVWriterPad }, checkBoxPad = { Checked = config.AVWriterPad },
numericTextBoxH = { Text = Math.Max(0, config.AVWriterResizeHeight).ToString() }, numericTextBoxH = { Text = Math.Max(0, config.AVWriterResizeHeight).ToString() },
numericTextBoxW = { Text = Math.Max(0, config.AVWriterResizeWidth).ToString() }, numericTextBoxW = { Text = Math.Max(0, config.AVWriterResizeWidth).ToString() },
labelDescriptionBody = { Text = "" } labelDescriptionBody = { Text = "" },
}; };
int idx = 0; int idx = 0;

2
src/BizHawk.Client.EmuHawk/ArchiveChooser.cs
View File

@ -232,7 +232,7 @@ namespace BizHawk.Client.EmuHawk
{ {
return new SimpleMatcher return new SimpleMatcher
{ {
Keys = searchKey.ToLowerInvariant().Split(Array.Empty<char>(), StringSplitOptions.RemoveEmptyEntries) // splits on all whitespace chars Keys = searchKey.ToLowerInvariant().Split(Array.Empty<char>(), StringSplitOptions.RemoveEmptyEntries), // splits on all whitespace chars
}; };
} }
else else

2
src/BizHawk.Client.EmuHawk/BizBox.cs
View File

@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
{ {
CoreInfoPanel.Controls.Add(new BizBoxInfoControl(core.CoreAttr) CoreInfoPanel.Controls.Add(new BizBoxInfoControl(core.CoreAttr)
{ {
Dock = DockStyle.Top Dock = DockStyle.Top,
}); });
} }
CoreInfoPanel.ResumeLayout(); CoreInfoPanel.ResumeLayout();

10
src/BizHawk.Client.EmuHawk/CoreFeatureAnalysis.cs
View File

@ -125,7 +125,7 @@ namespace BizHawk.Client.EmuHawk
var ret = new TreeNode var ret = new TreeNode
{ {
Text = ci.CoreName + (ci.Released ? "" : " (UNRELEASED)"), Text = ci.CoreName + (ci.Released ? "" : " (UNRELEASED)"),
ForeColor = ci.Released ? Color.Black : Color.DarkGray ForeColor = ci.Released ? Color.Black : Color.DarkGray,
}; };
foreach (var service in ci.Services.Values) foreach (var service in ci.Services.Values)
@ -137,7 +137,7 @@ namespace BizHawk.Client.EmuHawk
ForeColor = service.Complete ? Color.Black : Color.Red, ForeColor = service.Complete ? Color.Black : Color.Red,
ImageKey = img, ImageKey = img,
SelectedImageKey = img, SelectedImageKey = img,
StateImageKey = img StateImageKey = img,
}; };
foreach (var function in service.Functions) foreach (var function in service.Functions)
@ -149,7 +149,7 @@ namespace BizHawk.Client.EmuHawk
ForeColor = function.Complete ? Color.Black : Color.Red, ForeColor = function.Complete ? Color.Black : Color.Red,
ImageKey = img, ImageKey = img,
SelectedImageKey = img, SelectedImageKey = img,
StateImageKey = img StateImageKey = img,
}); });
} }
ret.Nodes.Add(serviceNode); ret.Nodes.Add(serviceNode);
@ -167,7 +167,7 @@ namespace BizHawk.Client.EmuHawk
ForeColor = Color.Red, ForeColor = Color.Red,
ImageKey = img, ImageKey = img,
SelectedImageKey = img, SelectedImageKey = img,
StateImageKey = img StateImageKey = img,
}; };
ret.Nodes.Add(serviceNode); ret.Nodes.Add(serviceNode);
} }
@ -227,7 +227,7 @@ namespace BizHawk.Client.EmuHawk
ForeColor = core.CoreAttr.Released ? Color.Black : Color.DarkGray, ForeColor = core.CoreAttr.Released ? Color.Black : Color.DarkGray,
ImageKey = img, ImageKey = img,
SelectedImageKey = img, SelectedImageKey = img,
StateImageKey = img StateImageKey = img,
}; };
CoreTree.Nodes.Add(coreNode); CoreTree.Nodes.Add(coreNode);
} }

2
src/BizHawk.Client.EmuHawk/CustomControls/FolderBrowserDialogEx.cs
View File

@ -75,7 +75,7 @@ namespace BizHawk.Client.EmuHawk
pszDisplayName = pszDisplayName, pszDisplayName = pszDisplayName,
lpszTitle = Description, lpszTitle = Description,
ulFlags = browseOptions, ulFlags = browseOptions,
lpfn = Callback lpfn = Callback,
}; };
pidlRet = SHBrowseForFolderW(ref bi); pidlRet = SHBrowseForFolderW(ref bi);

2
src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.Drawing.cs
View File

@ -477,7 +477,7 @@ namespace BizHawk.Client.EmuHawk
Cell relativeCell = new Cell Cell relativeCell = new Cell
{ {
RowIndex = cell.RowIndex - visibleRows.Start, RowIndex = cell.RowIndex - visibleRows.Start,
Column = cell.Column Column = cell.Column,
}; };
relativeCell.RowIndex -= CountLagFramesAbsolute(relativeCell.RowIndex.Value); relativeCell.RowIndex -= CountLagFramesAbsolute(relativeCell.RowIndex.Value);

8
src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs
View File

@ -567,7 +567,7 @@ namespace BizHawk.Client.EmuHawk
SelectCell(new Cell SelectCell(new Cell
{ {
RowIndex = index, RowIndex = index,
Column = _columns[0] Column = _columns[0],
}); });
_lastSelectedRow = index; _lastSelectedRow = index;
} }
@ -672,7 +672,7 @@ namespace BizHawk.Client.EmuHawk
Columns = _columns, Columns = _columns,
HorizontalOrientation = HorizontalOrientation, HorizontalOrientation = HorizontalOrientation,
LagFramesToHide = LagFramesToHide, LagFramesToHide = LagFramesToHide,
HideWasLagFrames = HideWasLagFrames HideWasLagFrames = HideWasLagFrames,
}; };
public class InputRollSettings public class InputRollSettings
@ -977,7 +977,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Name = "RotateMenuItem", Name = "RotateMenuItem",
Text = "Rotate", Text = "Rotate",
ShortcutKeyDisplayString = RotateHotkeyStr ShortcutKeyDisplayString = RotateHotkeyStr,
}; };
rotate.Click += (_, _) => HorizontalOrientation = !HorizontalOrientation; rotate.Click += (_, _) => HorizontalOrientation = !HorizontalOrientation;
return [ new ToolStripSeparator(), rotate ]; return [ new ToolStripSeparator(), rotate ];
@ -1087,7 +1087,7 @@ namespace BizHawk.Client.EmuHawk
CurrentCell = new Cell CurrentCell = new Cell
{ {
Column = null, Column = null,
RowIndex = null RowIndex = null,
}; };
base.OnMouseEnter(e); base.OnMouseEnter(e);

6
src/BizHawk.Client.EmuHawk/CustomControls/MsgBox.cs
View File

@ -143,16 +143,12 @@ namespace BizHawk.Client.EmuHawk.CustomControls
int requiredHeight = messageLbl.Location.Y + messageLbl.Size.Height - btn2.Location.Y + ClientSize.Height + TextYMargin; int requiredHeight = messageLbl.Location.Y + messageLbl.Size.Height - btn2.Location.Y + ClientSize.Height + TextYMargin;
int minSetWidth = ClientSize.Width; int minSetWidth = ClientSize.Width;
int minSetHeight = ClientSize.Height;
ClientSize = new Size ClientSize = new Size
{ {
Width = requiredWidth > minSetWidth Width = requiredWidth > minSetWidth
? requiredWidth ? requiredWidth
: minSetWidth, : minSetWidth,
Height = requiredHeight > minSetHeight Height = Math.Max(ClientSize.Height, requiredHeight),
? requiredHeight
: minSetHeight
}; };
} }

4
src/BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -44,7 +44,7 @@ namespace BizHawk.Client.EmuHawk
var menu = new ToolStripMenuItem var menu = new ToolStripMenuItem
{ {
Name = "GeneratedColumnsSubMenu", Name = "GeneratedColumnsSubMenu",
Text = "Columns" Text = "Columns",
}; };
var columns = inputRoll.AllColumns; var columns = inputRoll.AllColumns;
@ -57,7 +57,7 @@ namespace BizHawk.Client.EmuHawk
Text = $"{column.Text} ({column.Name})", Text = $"{column.Text} ({column.Name})",
Checked = column.Visible, Checked = column.Visible,
CheckOnClick = true, CheckOnClick = true,
Tag = column.Name Tag = column.Name,
}; };
menuItem.CheckedChanged += (o, ev) => menuItem.CheckedChanged += (o, ev) =>

6
src/BizHawk.Client.EmuHawk/Extensions/ToolExtensions.cs
View File

@ -185,7 +185,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
var freezeItem = new ToolStripMenuItem var freezeItem = new ToolStripMenuItem
{ {
Text = recent.Frozen ? "&Unfreeze" : "&Freeze", Text = recent.Frozen ? "&Unfreeze" : "&Freeze",
Image = recent.Frozen ? Properties.Resources.Unfreeze : Properties.Resources.Freeze Image = recent.Frozen ? Properties.Resources.Unfreeze : Properties.Resources.Freeze,
}; };
freezeItem.Click += (_, _) => recent.Frozen = !recent.Frozen; freezeItem.Click += (_, _) => recent.Frozen = !recent.Frozen;
items.Add(freezeItem); items.Add(freezeItem);
@ -204,7 +204,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
{ {
TextInputType = InputPrompt.InputType.Unsigned, TextInputType = InputPrompt.InputType.Unsigned,
Message = "Number of recent files to track", Message = "Number of recent files to track",
InitialValue = recent.MAX_RECENT_FILES.ToString() InitialValue = recent.MAX_RECENT_FILES.ToString(),
}; };
if (!mainForm.ShowDialogWithTempMute(prompt).IsOk()) return; if (!mainForm.ShowDialogWithTempMute(prompt).IsOk()) return;
var val = int.Parse(prompt.PromptText); var val = int.Parse(prompt.PromptText);
@ -243,7 +243,7 @@ namespace BizHawk.Client.EmuHawk.ToolExtensions
{ {
Text = name, Text = name,
Enabled = !(maxSize.HasValue && domain.Size > maxSize.Value), Enabled = !(maxSize.HasValue && domain.Size > maxSize.Value),
Checked = name == selected Checked = name == selected,
}; };
item.Click += (o, ev) => setCallback(name); item.Click += (o, ev) => setCallback(name);
return item; return item;

4
src/BizHawk.Client.EmuHawk/Input/Input.cs
View File

@ -52,7 +52,7 @@ namespace BizHawk.Client.EmuHawk
_updateThread = new Thread(UpdateThreadProc) _updateThread = new Thread(UpdateThreadProc)
{ {
IsBackground = true, IsBackground = true,
Priority = ThreadPriority.AboveNormal // why not? this thread shouldn't be very heavy duty, and we want it to be responsive Priority = ThreadPriority.AboveNormal, // why not? this thread shouldn't be very heavy duty, and we want it to be responsive
}; };
_updateThread.Start(); _updateThread.Start();
} }
@ -122,7 +122,7 @@ namespace BizHawk.Client.EmuHawk
{ {
EventType = newState ? InputEventType.Press : InputEventType.Release, EventType = newState ? InputEventType.Press : InputEventType.Release,
LogicalButton = new(button1, mods, () => _getConfigCallback().ModifierKeysEffective), LogicalButton = new(button1, mods, () => _getConfigCallback().ModifierKeysEffective),
Source = source Source = source,
}; };
_lastState[button1] = newState; _lastState[button1] = newState;

2
src/BizHawk.Client.EmuHawk/LogWindow.cs
View File

@ -56,7 +56,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Console.SetOut(new StreamWriter(Console.OpenStandardOutput()) Console.SetOut(new StreamWriter(Console.OpenStandardOutput())
{ {
AutoFlush = true AutoFlush = true,
}); });
_logWriter.Close(); _logWriter.Close();
_logWriter = null; _logWriter = null;

6
src/BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -436,7 +436,7 @@ namespace BizHawk.Client.EmuHawk
(b & MouseButtons.XButton1) != 0, (b & MouseButtons.XButton1) != 0,
(b & MouseButtons.XButton2) != 0 (b & MouseButtons.XButton2) != 0
); );
} },
}; };
FirmwareManager = new FirmwareManager(); FirmwareManager = new FirmwareManager();
movieSession = MovieSession = new MovieSession( movieSession = MovieSession = new MovieSession(
@ -3658,7 +3658,7 @@ namespace BizHawk.Client.EmuHawk
{ {
using var platformChooser = new PlatformChooser(Config) using var platformChooser = new PlatformChooser(Config)
{ {
RomGame = rom RomGame = rom,
}; };
this.ShowDialogWithTempMute(platformChooser); this.ShowDialogWithTempMute(platformChooser);
return platformChooser.PlatformChoice; return platformChooser.PlatformChoice;
@ -3727,7 +3727,7 @@ namespace BizHawk.Client.EmuHawk
ChoosePlatform = ChoosePlatformForRom, ChoosePlatform = ChoosePlatformForRom,
Deterministic = deterministic, Deterministic = deterministic,
MessageCallback = AddOnScreenMessage, MessageCallback = AddOnScreenMessage,
OpenAdvanced = args.OpenAdvanced OpenAdvanced = args.OpenAdvanced,
}; };
FirmwareManager.RecentlyServed.Clear(); FirmwareManager.RecentlyServed.Clear();

2
src/BizHawk.Client.EmuHawk/PlatformChooser.cs
View File

@ -39,7 +39,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Text = fullName, Text = fullName,
Location = UIHelper.Scale(new Point(15, 15 + (count * spacing))), Location = UIHelper.Scale(new Point(15, 15 + (count * spacing))),
Size = UIHelper.Scale(new Size(200, 23)) Size = UIHelper.Scale(new Size(200, 23)),
}; };
PlatformsGroupBox.Controls.Add(radio); PlatformsGroupBox.Controls.Add(radio);

4
src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.Debug.cs
View File

@ -199,8 +199,8 @@ namespace BizHawk.Client.EmuHawk
Policy = Policy =
{ {
UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.InspectSector_AssumeForm1, UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.InspectSector_AssumeForm1,
ThrowExceptions2048 = false ThrowExceptions2048 = false,
} },
}; };
_buf2352 = new byte[2352]; _buf2352 = new byte[2352];

16
src/BizHawk.Client.EmuHawk/RetroAchievements/RCheevos.cs
View File

@ -83,7 +83,7 @@ namespace BizHawk.Client.EmuHawk
var loginItem = new ToolStripMenuItem("Login") var loginItem = new ToolStripMenuItem("Login")
{ {
Visible = !LoggedIn Visible = !LoggedIn,
}; };
loginItem.Click += (_, _) => loginItem.Click += (_, _) =>
{ {
@ -96,7 +96,7 @@ namespace BizHawk.Client.EmuHawk
var logoutItem = new ToolStripMenuItem("Logout") var logoutItem = new ToolStripMenuItem("Logout")
{ {
Visible = LoggedIn Visible = LoggedIn,
}; };
logoutItem.Click += (_, _) => logoutItem.Click += (_, _) =>
{ {
@ -114,7 +114,7 @@ namespace BizHawk.Client.EmuHawk
var enableCheevosItem = new ToolStripMenuItem("Enable Achievements") var enableCheevosItem = new ToolStripMenuItem("Enable Achievements")
{ {
Checked = CheevosActive, Checked = CheevosActive,
CheckOnClick = true CheckOnClick = true,
}; };
enableCheevosItem.CheckedChanged += (_, _) => CheevosActive = !CheevosActive; enableCheevosItem.CheckedChanged += (_, _) => CheevosActive = !CheevosActive;
raDropDownItems.Add(enableCheevosItem); raDropDownItems.Add(enableCheevosItem);
@ -123,7 +123,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Checked = LBoardNotifsActive, Checked = LBoardNotifsActive,
CheckOnClick = true, CheckOnClick = true,
Enabled = HardcoreMode Enabled = HardcoreMode,
}; };
enableLboardNotifsItem.CheckedChanged += (_, _) => LBoardNotifsActive = !LBoardNotifsActive; enableLboardNotifsItem.CheckedChanged += (_, _) => LBoardNotifsActive = !LBoardNotifsActive;
raDropDownItems.Add(enableLboardNotifsItem); raDropDownItems.Add(enableLboardNotifsItem);
@ -132,7 +132,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Checked = RichPresenceActive || HardcoreMode, Checked = RichPresenceActive || HardcoreMode,
CheckOnClick = true, CheckOnClick = true,
Enabled = !HardcoreMode Enabled = !HardcoreMode,
}; };
enableRichPresenceItem.CheckedChanged += (_, _) => RichPresenceActive = !RichPresenceActive; enableRichPresenceItem.CheckedChanged += (_, _) => RichPresenceActive = !RichPresenceActive;
raDropDownItems.Add(enableRichPresenceItem); raDropDownItems.Add(enableRichPresenceItem);
@ -140,7 +140,7 @@ namespace BizHawk.Client.EmuHawk
var enableHardcoreItem = new ToolStripMenuItem("Enable Hardcore Mode") var enableHardcoreItem = new ToolStripMenuItem("Enable Hardcore Mode")
{ {
Checked = HardcoreMode, Checked = HardcoreMode,
CheckOnClick = true CheckOnClick = true,
}; };
enableHardcoreItem.CheckedChanged += (_, _) => enableHardcoreItem.CheckedChanged += (_, _) =>
{ {
@ -163,7 +163,7 @@ namespace BizHawk.Client.EmuHawk
var enableSoundEffectsItem = new ToolStripMenuItem("Enable Sound Effects") var enableSoundEffectsItem = new ToolStripMenuItem("Enable Sound Effects")
{ {
Checked = EnableSoundEffects, Checked = EnableSoundEffects,
CheckOnClick = true CheckOnClick = true,
}; };
enableSoundEffectsItem.CheckedChanged += (_, _) => EnableSoundEffects = !EnableSoundEffects; enableSoundEffectsItem.CheckedChanged += (_, _) => EnableSoundEffects = !EnableSoundEffects;
raDropDownItems.Add(enableSoundEffectsItem); raDropDownItems.Add(enableSoundEffectsItem);
@ -171,7 +171,7 @@ namespace BizHawk.Client.EmuHawk
var enableUnofficialCheevosItem = new ToolStripMenuItem("Test Unofficial Achievements") var enableUnofficialCheevosItem = new ToolStripMenuItem("Test Unofficial Achievements")
{ {
Checked = AllowUnofficialCheevos, Checked = AllowUnofficialCheevos,
CheckOnClick = true CheckOnClick = true,
}; };
enableUnofficialCheevosItem.CheckedChanged += (_, _) => ToggleUnofficialCheevos(); enableUnofficialCheevosItem.CheckedChanged += (_, _) => ToggleUnofficialCheevos();
raDropDownItems.Add(enableUnofficialCheevosItem); raDropDownItems.Add(enableUnofficialCheevosItem);

4
src/BizHawk.Client.EmuHawk/RetroAchievements/RetroAchievements.GameVerification.cs
View File

@ -35,8 +35,8 @@ namespace BizHawk.Client.EmuHawk
Policy = Policy =
{ {
UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.InspectSector_AssumeForm1, UserData2048Mode = DiscSectorReaderPolicy.EUserData2048Mode.InspectSector_AssumeForm1,
DeterministicClearBuffer = false // let's make this a little faster DeterministicClearBuffer = false, // let's make this a little faster
} },
}; };
var buf2048 = new byte[2048]; var buf2048 = new byte[2048];

2
src/BizHawk.Client.EmuHawk/config/ControllerConfig.cs
View File

@ -287,7 +287,7 @@ namespace BizHawk.Client.EmuHawk
var pictureBox2 = new PictureBox var pictureBox2 = new PictureBox
{ {
Image = Properties.Resources.C64Keyboard.Value, Image = Properties.Resources.C64Keyboard.Value,
Size = Properties.Resources.C64Keyboard.Value.Size Size = Properties.Resources.C64Keyboard.Value.Size,
}; };
tableLayoutPanel1.ColumnStyles[1].Width = Properties.Resources.C64Keyboard.Value.Width; tableLayoutPanel1.ColumnStyles[1].Width = Properties.Resources.C64Keyboard.Value.Width;
pictureBox1.Height /= 2; pictureBox1.Height /= 2;

3
src/BizHawk.Client.EmuHawk/config/ControllerConfig/AnalogBindPanel.cs
View File

@ -1,6 +1,5 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Windows.Forms; using System.Windows.Forms;
using System.Drawing;
using BizHawk.Client.Common; using BizHawk.Client.Common;
@ -25,7 +24,7 @@ namespace BizHawk.Client.EmuHawk
{ {
var ctrl = new AnalogBindControl(buttonName, _realConfigObject[buttonName]) var ctrl = new AnalogBindControl(buttonName, _realConfigObject[buttonName])
{ {
Location = new Point(x, y) Location = new(x, y),
}; };
y += ctrl.Height + 4; y += ctrl.Height + 4;

4
src/BizHawk.Client.EmuHawk/config/ControllerConfig/ControllerConfigPanel.cs
View File

@ -128,7 +128,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(x, y), Location = new Point(x, y),
Size = new Size(_inputSize, UIHelper.ScaleY(23)), Size = new Size(_inputSize, UIHelper.ScaleY(23)),
TabIndex = i, TabIndex = i,
AutoTab = _autoTab AutoTab = _autoTab,
}; };
iw.SetupTooltip(Tooltip, null); iw.SetupTooltip(Tooltip, null);
@ -140,7 +140,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Location = new Point(x + _inputSize + _labelPadding, y + UIHelper.ScaleY(3)), Location = new Point(x + _inputSize + _labelPadding, y + UIHelper.ScaleY(3)),
Size = new Size(labelWidth, UIHelper.ScaleY(15)), Size = new Size(labelWidth, UIHelper.ScaleY(15)),
Text = _buttons[i].Replace('_', ' ').Trim() Text = _buttons[i].Replace('_', ' ').Trim(),
}; };
Tooltip.SetToolTip(label, label.Text); Tooltip.SetToolTip(label, label.Text);

2
src/BizHawk.Client.EmuHawk/config/ControllerConfig/FeedbackBindControl.cs
View File

@ -114,7 +114,7 @@ namespace BizHawk.Client.EmuHawk
{ {
flpBindReadout, flpBindReadout,
new SingleRowFLP { Controls = { flpButtons, flpPrescale } }, new SingleRowFLP { Controls = { flpButtons, flpPrescale } },
} },
}); });
ResumeLayout(); ResumeLayout();
} }

3
src/BizHawk.Client.EmuHawk/config/FileExtensionPreferences.cs
View File

@ -1,5 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
@ -27,7 +26,7 @@ namespace BizHawk.Client.EmuHawk
{ {
FileExtension = fileExt, FileExtension = fileExt,
OriginalPreference = sysID, OriginalPreference = sysID,
Location = new Point(UIHelper.ScaleX(15), UIHelper.ScaleY(15) + (spacing * count)) Location = new(UIHelper.ScaleX(15), UIHelper.ScaleY(15) + (spacing * count)),
}; };
count++; count++;

7
src/BizHawk.Client.EmuHawk/config/FirmwareConfig.cs
View File

@ -210,7 +210,7 @@ namespace BizHawk.Client.EmuHawk
Tag = fr, Tag = fr,
UseItemStyleForSubItems = false, UseItemStyleForSubItems = false,
ImageIndex = (int) FirmwareOptionStatus.Unknown, ImageIndex = (int) FirmwareOptionStatus.Unknown,
ToolTipText = null ToolTipText = null,
}; };
lvi.SubItems.Add(sysID); lvi.SubItems.Add(sysID);
lvi.SubItems.Add(fr.ID.Firmware); lvi.SubItems.Add(fr.ID.Firmware);
@ -546,10 +546,7 @@ namespace BizHawk.Client.EmuHawk
var fciDialog = new FirmwareConfigInfo var fciDialog = new FirmwareConfigInfo
{ {
lblFirmware = lblFirmware = { Text = $"{fr.ID} ({fr.Description})" },
{
Text = $"{fr.ID} ({fr.Description})"
}
}; };
foreach (var o in options) foreach (var o in options)

2
src/BizHawk.Client.EmuHawk/config/GB/ColorChooserForm.cs
View File

@ -131,7 +131,7 @@ namespace BizHawk.Client.EmuHawk
{ {
AllowFullOpen = true, AllowFullOpen = true,
AnyColor = true, AnyColor = true,
Color = _colors[i] Color = _colors[i],
}; };
// custom colors are ints, not Color structs? // custom colors are ints, not Color structs?

2
src/BizHawk.Client.EmuHawk/config/GB/SameBoyColorChooserForm.cs
View File

@ -94,7 +94,7 @@ namespace BizHawk.Client.EmuHawk
{ {
AllowFullOpen = true, AllowFullOpen = true,
AnyColor = true, AnyColor = true,
Color = _colors[i] Color = _colors[i],
}; };
// custom colors are ints, not Color structs? // custom colors are ints, not Color structs?

6
src/BizHawk.Client.EmuHawk/config/HotkeyConfig.cs
View File

@ -108,7 +108,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Text = b.DisplayName, Text = b.DisplayName,
Location = new Point(x, y), Location = new Point(x, y),
Size = new Size(iwOffsetX - UIHelper.ScaleX(2), UIHelper.ScaleY(15)) Size = new(iwOffsetX - UIHelper.ScaleX(2), UIHelper.ScaleY(15)),
}; };
var w = new InputCompositeWidget(_config.ModifierKeysEffective) var w = new InputCompositeWidget(_config.ModifierKeysEffective)
@ -116,7 +116,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(x + iwOffsetX, y + iwOffsetY), Location = new Point(x + iwOffsetX, y + iwOffsetY),
AutoTab = AutoTabCheckBox.Checked, AutoTab = AutoTabCheckBox.Checked,
Width = iwWidth, Width = iwWidth,
WidgetName = k WidgetName = k,
}; };
w.SetupTooltip(toolTip1, b.ToolTip); w.SetupTooltip(toolTip1, b.ToolTip);
@ -141,7 +141,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Text = "Save States hotkeys operate with branches when TAStudio is engaged.", Text = "Save States hotkeys operate with branches when TAStudio is engaged.",
Location = new Point(x, y), Location = new Point(x, y),
Size = new Size(iwWidth + iwOffsetX, HotkeyTabControl.Height - y) Size = new(iwWidth + iwOffsetX, HotkeyTabControl.Height - y),
}); });
} }

3
src/BizHawk.Client.EmuHawk/config/Messages/ColorRow.cs
View File

@ -37,7 +37,8 @@ namespace BizHawk.Client.EmuHawk
{ {
using var colorPicker = new ColorDialog using var colorPicker = new ColorDialog
{ {
FullOpen = true, Color = Color.FromArgb(_selectedColor) Color = Color.FromArgb(_selectedColor),
FullOpen = true,
}; };
if (colorPicker.ShowDialog().IsOk()) if (colorPicker.ShowDialog().IsOk())

4
src/BizHawk.Client.EmuHawk/config/Messages/MessageConfig.cs
View File

@ -106,7 +106,7 @@ namespace BizHawk.Client.EmuHawk
var row = new MessageRow var row = new MessageRow
{ {
Name = name, Name = name,
Location = new Point(10, y) Location = new(10, y),
}; };
row.Size = new Size(MessageTypeBox.Width - 12, row.Size.Height); row.Size = new Size(MessageTypeBox.Width - 12, row.Size.Height);
row.Bind(name, pos, e => SetMessagePosition(row, e)); row.Bind(name, pos, e => SetMessagePosition(row, e));
@ -132,7 +132,7 @@ namespace BizHawk.Client.EmuHawk
Name = name, Name = name,
Location = new Point(10, y), Location = new Point(10, y),
DisplayName = name, DisplayName = name,
SelectedColor = argb SelectedColor = argb,
}; };
row.Size = new Size(ColorBox.Width - 12, row.Size.Height); row.Size = new Size(ColorBox.Width - 12, row.Size.Height);
y += row.Size.Height; y += row.Size.Height;

2
src/BizHawk.Client.EmuHawk/config/NES/NesControllerSettings.cs
View File

@ -43,7 +43,7 @@ namespace BizHawk.Client.EmuHawk
Famicom = checkBoxFamicom.Checked, Famicom = checkBoxFamicom.Checked,
FamicomExpPort = (string)comboBoxFamicom.SelectedItem, FamicomExpPort = (string)comboBoxFamicom.SelectedItem,
NesLeftPort = (string)comboBoxNESL.SelectedItem, NesLeftPort = (string)comboBoxNESL.SelectedItem,
NesRightPort = (string)comboBoxNESR.SelectedItem NesRightPort = (string)comboBoxNESR.SelectedItem,
}; };
bool changed = NESControlSettings.NeedsReboot(controls, _syncSettings.Controls); bool changed = NESControlSettings.NeedsReboot(controls, _syncSettings.Controls);

2
src/BizHawk.Client.EmuHawk/config/PSX/PSXControllerConfig.cs
View File

@ -60,7 +60,7 @@ namespace BizHawk.Client.EmuHawk
var uc = new OctoshockFIOConfigUser var uc = new OctoshockFIOConfigUser
{ {
Memcards = { [0] = cbMemcard_1.Checked, [1] = cbMemcard_2.Checked }, Memcards = { [0] = cbMemcard_1.Checked, [1] = cbMemcard_2.Checked },
Multitaps = { [0] = cbMultitap_1.Checked, [1] = cbMultitap_2.Checked } Multitaps = [ cbMultitap_1.Checked, cbMultitap_2.Checked ],
}; };
var combos = new[] { combo_1_1, combo_1_2, combo_1_3, combo_1_4, combo_2_1, combo_2_2, combo_2_3, combo_2_4 }; var combos = new[] { combo_1_1, combo_1_2, combo_1_3, combo_1_4, combo_2_1, combo_2_2, combo_2_3, combo_2_4 };

12
src/BizHawk.Client.EmuHawk/config/PathConfig.cs
View File

@ -78,7 +78,7 @@ namespace BizHawk.Client.EmuHawk
MinimumSize = new Size(UIHelper.ScaleX(26), UIHelper.ScaleY(23)), MinimumSize = new Size(UIHelper.ScaleX(26), UIHelper.ScaleY(23)),
AutoCompleteMode = AutoCompleteMode.SuggestAppend, AutoCompleteMode = AutoCompleteMode.SuggestAppend,
AutoCompleteCustomSource = AutoCompleteOptions, AutoCompleteCustomSource = AutoCompleteOptions,
AutoCompleteSource = AutoCompleteSource.CustomSource AutoCompleteSource = AutoCompleteSource.CustomSource,
}; };
var btn = new Button var btn = new Button
@ -88,7 +88,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(widgetOffset, y + buttonOffsetY), Location = new Point(widgetOffset, y + buttonOffsetY),
Size = new Size(buttonWidth, buttonHeight), Size = new Size(buttonWidth, buttonHeight),
Name = path.Type, Name = path.Type,
Anchor = AnchorStyles.Top | AnchorStyles.Right Anchor = AnchorStyles.Top | AnchorStyles.Right,
}; };
var tempBox = box; var tempBox = box;
@ -102,7 +102,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(widgetOffset + buttonWidth + padding, y + UIHelper.ScaleY(4)), Location = new Point(widgetOffset + buttonWidth + padding, y + UIHelper.ScaleY(4)),
Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)), Size = new Size(UIHelper.ScaleX(100), UIHelper.ScaleY(15)),
Name = path.Type, Name = path.Type,
Anchor = AnchorStyles.Top | AnchorStyles.Right Anchor = AnchorStyles.Top | AnchorStyles.Right,
}; };
t.Controls.Add(label); t.Controls.Add(label);
@ -119,7 +119,7 @@ namespace BizHawk.Client.EmuHawk
Name = system, Name = system,
Text = systemDisplayName, Text = systemDisplayName,
Width = UIHelper.ScaleX(200), // Initial Left/Width of child controls are based on this size. Width = UIHelper.ScaleX(200), // Initial Left/Width of child controls are based on this size.
AutoScroll = true AutoScroll = true,
}; };
PopulateTabPage(t, system); PopulateTabPage(t, system);
comboSystem.Items.Add(systemDisplayName); comboSystem.Items.Add(systemDisplayName);
@ -190,7 +190,7 @@ namespace BizHawk.Client.EmuHawk
using var f = new FolderBrowserDialog using var f = new FolderBrowserDialog
{ {
Description = $"Set the directory for {name}", Description = $"Set the directory for {name}",
SelectedPath = _pathEntries.AbsolutePathFor(box.Text, system) SelectedPath = _pathEntries.AbsolutePathFor(box.Text, system),
}; };
result = f.ShowDialog(); result = f.ShowDialog();
selectedPath = f.SelectedPath; selectedPath = f.SelectedPath;
@ -200,7 +200,7 @@ namespace BizHawk.Client.EmuHawk
using var f = new FolderBrowserEx using var f = new FolderBrowserEx
{ {
Description = $"Set the directory for {name}", Description = $"Set the directory for {name}",
SelectedPath = _pathEntries.AbsolutePathFor(box.Text, system) SelectedPath = _pathEntries.AbsolutePathFor(box.Text, system),
}; };
result = f.ShowDialog(); result = f.ShowDialog();
selectedPath = f.SelectedPath; selectedPath = f.SelectedPath;

2
src/BizHawk.Client.EmuHawk/config/SNES/BSNESOptions.cs
View File

@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
ShowBg3_0 = s.ShowBG3_0, ShowBg3_0 = s.ShowBG3_0,
ShowBg3_1 = s.ShowBG3_1, ShowBg3_1 = s.ShowBG3_1,
ShowBg4_0 = s.ShowBG4_0, ShowBg4_0 = s.ShowBG4_0,
ShowBg4_1 = s.ShowBG4_1 ShowBg4_1 = s.ShowBG4_1,
}; };
var result = dialogParent.ShowDialogAsChild(dlg); var result = dialogParent.ShowDialogAsChild(dlg);

2
src/BizHawk.Client.EmuHawk/config/SNES/SNESOptions.cs
View File

@ -32,7 +32,7 @@ namespace BizHawk.Client.EmuHawk
ShowBg1 = s.ShowBG1_0, ShowBg1 = s.ShowBG1_0,
ShowBg2 = s.ShowBG2_0, ShowBg2 = s.ShowBG2_0,
ShowBg3 = s.ShowBG3_0, ShowBg3 = s.ShowBG3_0,
ShowBg4 = s.ShowBG4_0 ShowBg4 = s.ShowBG4_0,
}; };
var result = dialogParent.ShowDialogAsChild(dlg); var result = dialogParent.ShowDialogAsChild(dlg);

4
src/BizHawk.Client.EmuHawk/config/TI83/TI83PaletteConfig.cs
View File

@ -56,7 +56,7 @@ namespace BizHawk.Client.EmuHawk
AllowFullOpen = true, AllowFullOpen = true,
AnyColor = true, AnyColor = true,
Color = BackgroundPanel.BackColor, Color = BackgroundPanel.BackColor,
CustomColors = new[] { customColor } CustomColors = [ customColor ],
}; };
if (dlg.ShowDialog().IsOk()) if (dlg.ShowDialog().IsOk())
@ -77,7 +77,7 @@ namespace BizHawk.Client.EmuHawk
AllowFullOpen = true, AllowFullOpen = true,
AnyColor = true, AnyColor = true,
Color = ForeGroundPanel.BackColor, Color = ForeGroundPanel.BackColor,
CustomColors = new[] { customColor } CustomColors = [ customColor ],
}; };
if (dlg.ShowDialog().IsOk()) if (dlg.ShowDialog().IsOk())

2
src/BizHawk.Client.EmuHawk/debug/N64RomByteswapToolForm.cs
View File

@ -76,7 +76,7 @@ namespace BizHawk.Client.EmuHawk.ForDebugging
new SingleRowFLP { Controls = { new LabelEx { Text = "to" }, comboFormats } }, new SingleRowFLP { Controls = { new LabelEx { Text = "to" }, comboFormats } },
new SingleRowFLP { Controls = { txtTargetFile, GenControl.Button("(browse)", width: 75, ChooseTargetFile) } }, new SingleRowFLP { Controls = { txtTargetFile, GenControl.Button("(browse)", width: 75, ChooseTargetFile) } },
GenControl.Button("--> convert", width: 75, DoConvert), GenControl.Button("--> convert", width: 75, DoConvert),
} },
}); });
ResumeLayout(); ResumeLayout();
} }

4
src/BizHawk.Client.EmuHawk/movie/PlayMovie.cs
View File

@ -89,7 +89,7 @@ namespace BizHawk.Client.EmuHawk
string displayedPath = entry.Filename.RemovePrefix(_config.PathEntries.MovieAbsolutePath() + Path.DirectorySeparatorChar); string displayedPath = entry.Filename.RemovePrefix(_config.PathEntries.MovieAbsolutePath() + Path.DirectorySeparatorChar);
e.Item = new ListViewItem(displayedPath) e.Item = new ListViewItem(displayedPath)
{ {
ToolTipText = entry.Filename ToolTipText = entry.Filename,
}; };
e.Item.SubItems.Add(entry.SystemID); e.Item.SubItems.Add(entry.SystemID);
e.Item.SubItems.Add(entry.GameName); e.Item.SubItems.Add(entry.GameName);
@ -476,7 +476,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Keys = DetailsView.Items[i].Text, Keys = DetailsView.Items[i].Text,
Values = DetailsView.Items[i].SubItems[1].Text, Values = DetailsView.Items[i].SubItems[1].Text,
BackgroundColor = DetailsView.Items[i].BackColor BackgroundColor = DetailsView.Items[i].BackColor,
}); });
} }

2
src/BizHawk.Client.EmuHawk/tools/BasicBot/BasicBot.cs
View File

@ -798,7 +798,7 @@ namespace BizHawk.Client.EmuHawk
Probability = 0.0, Probability = 0.0,
Location = new Point(marginLeft, startY + accumulatedY), Location = new Point(marginLeft, startY + accumulatedY),
TabIndex = count + 1, TabIndex = count + 1,
ProbabilityChangedCallback = AssessRunButtonStatus ProbabilityChangedCallback = AssessRunButtonStatus,
}; };
control.Scale(UIHelper.AutoScaleFactor); control.Scale(UIHelper.AutoScaleFactor);

2
src/BizHawk.Client.EmuHawk/tools/Debugger/BreakpointControl.cs
View File

@ -279,7 +279,7 @@ namespace BizHawk.Client.EmuHawk
var b = new AddBreakpointDialog(operation) var b = new AddBreakpointDialog(operation)
{ {
MaxAddressSize = MemoryDomains.SystemBus.Size - 1 MaxAddressSize = MemoryDomains.SystemBus.Size - 1,
}; };
if (type != null) if (type != null)

10
src/BizHawk.Client.EmuHawk/tools/Debugger/RegisterBoxControl.cs
View File

@ -138,7 +138,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Text = name, Text = name,
Location = new Point(UIHelper.ScaleX(5), y + UIHelper.ScaleY(2)), Location = new Point(UIHelper.ScaleX(5), y + UIHelper.ScaleY(2)),
Size = new Size(UIHelper.ScaleX(width + 5), UIHelper.ScaleY(15)) Size = new(UIHelper.ScaleX(width + 5), UIHelper.ScaleY(15)),
}); });
if (_canSetCpuRegisters) if (_canSetCpuRegisters)
@ -150,7 +150,7 @@ namespace BizHawk.Client.EmuHawk
Width = UIHelper.ScaleX(6 + ((rv.BitSize / 4) * 9)), Width = UIHelper.ScaleX(6 + ((rv.BitSize / 4) * 9)),
Location = new Point(UIHelper.ScaleX(width + 10), y), Location = new Point(UIHelper.ScaleX(width + 10), y),
MaxLength = rv.BitSize / 4, MaxLength = rv.BitSize / 4,
CharacterCasing = CharacterCasing.Upper CharacterCasing = CharacterCasing.Upper,
}; };
t.TextChanged += (o, e) => t.TextChanged += (o, e) =>
@ -183,7 +183,7 @@ namespace BizHawk.Client.EmuHawk
Name = name, Name = name,
Text = rv.Value.ToHexString(rv.BitSize / 4), Text = rv.Value.ToHexString(rv.BitSize / 4),
Size = new Size(UIHelper.ScaleX(6 + ((rv.BitSize / 4) * 9)), UIHelper.ScaleY(15)), Size = new Size(UIHelper.ScaleX(6 + ((rv.BitSize / 4) * 9)), UIHelper.ScaleY(15)),
Location = new Point(UIHelper.ScaleX(width + 12), y + 2) Location = new(UIHelper.ScaleX(width + 12), y + 2),
}); });
} }
@ -200,7 +200,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(UIHelper.ScaleX(5), y), Location = new Point(UIHelper.ScaleX(5), y),
BorderStyle = BorderStyle.None, BorderStyle = BorderStyle.None,
Size = new Size(UIHelper.ScaleX(240), UIHelper.ScaleY(23)), Size = new Size(UIHelper.ScaleX(240), UIHelper.ScaleY(23)),
AutoScroll = true AutoScroll = true,
}; };
foreach (var (name, rv) in registers.Where(r => r.Value.BitSize == 1).OrderByDescending(x => x.Key)) foreach (var (name, rv) in registers.Where(r => r.Value.BitSize == 1).OrderByDescending(x => x.Key))
@ -214,7 +214,7 @@ namespace BizHawk.Client.EmuHawk
Location = new Point(UIHelper.ScaleX(40), y), Location = new Point(UIHelper.ScaleX(40), y),
Dock = DockStyle.Left, Dock = DockStyle.Left,
Size = new Size(UIHelper.ScaleX(23), UIHelper.ScaleY(23)), Size = new Size(UIHelper.ScaleX(23), UIHelper.ScaleY(23)),
Enabled = _canSetCpuRegisters Enabled = _canSetCpuRegisters,
}; };
c.CheckedChanged += (o, e) => c.CheckedChanged += (o, e) =>

2
src/BizHawk.Client.EmuHawk/tools/ExternalToolManager.cs
View File

@ -95,7 +95,7 @@ namespace BizHawk.Client.EmuHawk
{ {
IncludeSubdirectories = false, IncludeSubdirectories = false,
NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.FileName, NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.FileName,
Filter = "*.dll" Filter = "*.dll",
}; };
DirectoryMonitor.Created += DirectoryMonitor_Created; DirectoryMonitor.Created += DirectoryMonitor_Created;
DirectoryMonitor.EnableRaisingEvents = true; DirectoryMonitor.EnableRaisingEvents = true;

2
src/BizHawk.Client.EmuHawk/tools/GB/GBGPUView.cs
View File

@ -1035,7 +1035,7 @@ namespace BizHawk.Client.EmuHawk
AllowFullOpen = true, AllowFullOpen = true,
AnyColor = true, AnyColor = true,
FullOpen = true, FullOpen = true,
Color = Spriteback Color = Spriteback,
}; };
if (this.ShowDialogWithTempMute(dlg).IsOk()) if (this.ShowDialogWithTempMute(dlg).IsOk())

2
src/BizHawk.Client.EmuHawk/tools/GB/GBPrinterView.cs
View File

@ -50,7 +50,7 @@ namespace BizHawk.Client.EmuHawk
Matrix11 = (0xEB - 0x10) / 255F, Matrix11 = (0xEB - 0x10) / 255F,
Matrix41 = 0x10 / 255F, Matrix41 = 0x10 / 255F,
Matrix22 = (0xD7 - 0x18) / 255F, Matrix22 = (0xD7 - 0x18) / 255F,
Matrix42 = 0x18 / 255F Matrix42 = 0x18 / 255F,
}; };
paperView.ChangeBitmapSize(PaperWidth, PaperWidth); paperView.ChangeBitmapSize(PaperWidth, PaperWidth);

8
src/BizHawk.Client.EmuHawk/tools/HexEditor/HexEditor.cs
View File

@ -1447,7 +1447,7 @@ namespace BizHawk.Client.EmuHawk
InitialLocation = PointToScreen(AddressesLabel.Location), InitialLocation = PointToScreen(AddressesLabel.Location),
InitialValue = _findStr, InitialValue = _findStr,
SearchTypeChangedCallback = SearchTypeChanged, SearchTypeChangedCallback = SearchTypeChanged,
InitialText = _lastSearchWasText InitialText = _lastSearchWasText,
}; };
_hexFind.Show(); _hexFind.Show();
@ -1503,7 +1503,7 @@ namespace BizHawk.Client.EmuHawk
var romMenuItem = new ToolStripMenuItem var romMenuItem = new ToolStripMenuItem
{ {
Text = _romDomain.Name, Text = _romDomain.Name,
Checked = _domain.Name == _romDomain.Name Checked = _domain.Name == _romDomain.Name,
}; };
MemoryDomainsMenuItem.DropDownItems.Add(new ToolStripSeparator()); MemoryDomainsMenuItem.DropDownItems.Add(new ToolStripSeparator());
@ -1540,7 +1540,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Text = "Go to Address", Text = "Go to Address",
StartLocation = this.ChildPointToScreen(MemoryViewerBox), StartLocation = this.ChildPointToScreen(MemoryViewerBox),
Message = "Enter a hexadecimal value" Message = "Enter a hexadecimal value",
}; };
if (this.ShowDialogWithTempMute(inputPrompt).IsOk() && inputPrompt.PromptText.IsHex()) if (this.ShowDialogWithTempMute(inputPrompt).IsOk() && inputPrompt.PromptText.IsHex())
@ -1599,7 +1599,7 @@ namespace BizHawk.Client.EmuHawk
using var poke = new RamPoke(DialogController, watches, MainForm.CheatList) using var poke = new RamPoke(DialogController, watches, MainForm.CheatList)
{ {
InitialLocation = this.ChildPointToScreen(AddressLabel), InitialLocation = this.ChildPointToScreen(AddressLabel),
ParentTool = this ParentTool = this,
}; };
this.ShowDialogWithTempMute(poke); this.ShowDialogWithTempMute(poke);
GeneralUpdate(); GeneralUpdate();

4
src/BizHawk.Client.EmuHawk/tools/HexEditor/HexFind.cs
View File

@ -78,7 +78,7 @@ namespace BizHawk.Client.EmuHawk
Nullable = HexRadio.Checked, Nullable = HexRadio.Checked,
Text = text, Text = text,
Size = size, Size = size,
Location = location Location = location,
}; };
} }
else else
@ -87,7 +87,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Text = text, Text = text,
Size = size, Size = size,
Location = location Location = location,
}; };
} }

6
src/BizHawk.Client.EmuHawk/tools/Lua/Libraries/TAStudioLuaLibrary.cs
View File

@ -261,7 +261,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Type = LuaChangeTypes.InsertFrames, Type = LuaChangeTypes.InsertFrames,
Frame = frame, Frame = frame,
Number = number Number = number,
}); });
} }
} }
@ -276,7 +276,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Type = LuaChangeTypes.DeleteFrames, Type = LuaChangeTypes.DeleteFrames,
Frame = frame, Frame = frame,
Number = number Number = number,
}); });
} }
} }
@ -291,7 +291,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Type = LuaChangeTypes.ClearFrames, Type = LuaChangeTypes.ClearFrames,
Frame = frame, Frame = frame,
Number = number Number = number,
}); });
} }
} }

2
src/BizHawk.Client.EmuHawk/tools/Lua/LuaCanvas.cs
View File

@ -65,7 +65,7 @@ namespace BizHawk.Client.EmuHawk
Size = new Size(100, 50), Size = new Size(100, 50),
SizeMode = PictureBoxSizeMode.AutoSize, SizeMode = PictureBoxSizeMode.AutoSize,
TabIndex = 0, TabIndex = 0,
TabStop = false TabStop = false,
}; };
Controls.Add(luaPictureBox); Controls.Add(luaPictureBox);

4
src/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
View File

@ -936,7 +936,7 @@ namespace BizHawk.Client.EmuHawk
Process.Start(new ProcessStartInfo Process.Start(new ProcessStartInfo
{ {
Verb = "Open", Verb = "Open",
FileName = file.Path FileName = file.Path,
}); });
} }
} }
@ -1086,7 +1086,7 @@ namespace BizHawk.Client.EmuHawk
{ {
new LuaRegisteredFunctionsList((MainForm) MainForm, LuaImp.RegisteredFunctions) new LuaRegisteredFunctionsList((MainForm) MainForm, LuaImp.RegisteredFunctions)
{ {
StartLocation = this.ChildPointToScreen(LuaListView) StartLocation = this.ChildPointToScreen(LuaListView),
}.Show(); }.Show();
} }
} }

4
src/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
View File

@ -56,7 +56,7 @@ namespace BizHawk.Client.EmuHawk
var main = new MovieZone(Emulator, Tools, MovieSession, 0, CurrentMovie.InputLogLength) var main = new MovieZone(Emulator, Tools, MovieSession, 0, CurrentMovie.InputLogLength)
{ {
Name = "Entire Movie" Name = "Entire Movie",
}; };
_zones.Add(main); _zones.Add(main);
@ -130,7 +130,7 @@ namespace BizHawk.Client.EmuHawk
var newZone = new MovieZone(Emulator, Tools, MovieSession, (int) StartNum.Value, (int) (EndNum.Value - StartNum.Value + 1)) var newZone = new MovieZone(Emulator, Tools, MovieSession, (int) StartNum.Value, (int) (EndNum.Value - StartNum.Value + 1))
{ {
Name = $"Zone {_zones.Count}" Name = $"Zone {_zones.Count}",
}; };
_zones.Add(newZone); _zones.Add(newZone);
ZonesList.Items.Add($"{newZone.Name} - length: {newZone.Length}"); ZonesList.Items.Add($"{newZone.Name} - length: {newZone.Length}");

4
src/BizHawk.Client.EmuHawk/tools/MultiDiskBundler/MultiDiskBundler.cs
View File

@ -179,7 +179,7 @@ namespace BizHawk.Client.EmuHawk
Text = "", Text = "",
Location = UIHelper.Scale(new Point(6, start)), Location = UIHelper.Scale(new Point(6, start)),
Size = new Size(FileSelectorPanel.ClientSize.Width - UIHelper.ScaleX(12), UIHelper.ScaleY(41)), Size = new Size(FileSelectorPanel.ClientSize.Width - UIHelper.ScaleX(12), UIHelper.ScaleY(41)),
Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top,
}; };
var mdf = new MultiDiskFileSelector(MainForm, Config.PathEntries, var mdf = new MultiDiskFileSelector(MainForm, Config.PathEntries,
@ -187,7 +187,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Location = UIHelper.Scale(new Point(7, 12)), Location = UIHelper.Scale(new Point(7, 12)),
Width = groupBox.ClientSize.Width - UIHelper.ScaleX(13), Width = groupBox.ClientSize.Width - UIHelper.ScaleX(13),
Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top,
}; };
mdf.NameChanged += FileSelector_NameChanged; mdf.NameChanged += FileSelector_NameChanged;

10
src/BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
View File

@ -462,26 +462,26 @@ namespace BizHawk.Client.EmuHawk
En = !apu.pulse[0].Debug_IsSilenced, En = !apu.pulse[0].Debug_IsSilenced,
Vol = (byte) apu.pulse[0].Debug_Volume, Vol = (byte) apu.pulse[0].Debug_Volume,
Note = pulse0Note, Note = pulse0Note,
Type = (byte) apu.pulse[0].Debug_DutyType Type = (byte) apu.pulse[0].Debug_DutyType,
}, },
Pulse1 = Pulse1 =
{ {
En = !apu.pulse[1].Debug_IsSilenced, En = !apu.pulse[1].Debug_IsSilenced,
Vol = (byte) apu.pulse[1].Debug_Volume, Vol = (byte) apu.pulse[1].Debug_Volume,
Note = pulse1Note, Note = pulse1Note,
Type = (byte) apu.pulse[1].Debug_DutyType Type = (byte) apu.pulse[1].Debug_DutyType,
}, },
Triangle = Triangle =
{ {
En = !apu.triangle.Debug_IsSilenced, En = !apu.triangle.Debug_IsSilenced,
Note = triNote Note = triNote,
}, },
Noise = Noise =
{ {
En = !apu.noise.Debug_IsSilenced, En = !apu.noise.Debug_IsSilenced,
Vol = (byte) apu.noise.Debug_Volume, Vol = (byte) apu.noise.Debug_Volume,
Note = noiseNote Note = noiseNote,
} },
}; };
_log.Add(rec); _log.Add(rec);

2
src/BizHawk.Client.EmuHawk/tools/PCE/PCESoundDebugger.cs
View File

@ -116,7 +116,7 @@ namespace BizHawk.Client.EmuHawk
WaveForm = waveform, WaveForm = waveform,
Active = true, Active = true,
HitCount = 1, HitCount = 1,
Index = _psgEntries.Count Index = _psgEntries.Count,
}; };
_psgEntries.Add(entry); _psgEntries.Add(entry);
_psgEntryTable[md5] = entry; _psgEntryTable[md5] = entry;

8
src/BizHawk.Client.EmuHawk/tools/SNES/SNESGraphicsDebugger.cs
View File

@ -597,7 +597,7 @@ namespace BizHawk.Client.EmuHawk
X = start % 16, X = start % 16,
Y = start / 16, Y = start / 16,
Width = num, Width = num,
Height = num / 16 Height = num / 16,
}; };
if (ret.Height == 0) ret.Height = 1; if (ret.Height == 0) ret.Height = 1;
@ -1040,7 +1040,7 @@ namespace BizHawk.Client.EmuHawk
{ {
Bpp = bpp, Bpp = bpp,
Type = CurrDisplaySelection, Type = CurrDisplaySelection,
Tile = tileNum Tile = tileNum,
}; };
currTileDataState.Address = (bpp == 7 ? 8 : bpp) * 8 * currTileDataState.Tile; currTileDataState.Address = (bpp == 7 ? 8 : bpp) * 8 * currTileDataState.Tile;
currTileDataState.Palette = currPaletteSelection.start; currTileDataState.Palette = currPaletteSelection.start;
@ -1161,7 +1161,7 @@ namespace BizHawk.Client.EmuHawk
{ {
bgnum = (int) CurrDisplaySelection, bgnum = (int) CurrDisplaySelection,
entry = map[tloc], entry = map[tloc],
Location = new Point(tx, ty) Location = new Point(tx, ty),
}; };
SetTab(tpMapEntry); SetTab(tpMapEntry);
@ -1226,7 +1226,7 @@ namespace BizHawk.Client.EmuHawk
{ {
var cd = new ColorDialog var cd = new ColorDialog
{ {
Color = pnBackdropColor.BackColor Color = pnBackdropColor.BackColor,
}; };
if (cd.ShowDialog(this).IsOk()) if (cd.ShowDialog(this).IsOk())

4
src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs
View File

@ -173,7 +173,7 @@ namespace BizHawk.Client.EmuHawk
ChangeLog = new(Movie), ChangeLog = new(Movie),
TimeStamp = DateTime.Now, TimeStamp = DateTime.Now,
Markers = Movie.Markers.DeepClone(), Markers = Movie.Markers.DeepClone(),
UserText = Movie.Branches.NewBranchText UserText = Movie.Branches.NewBranchText,
}; };
} }
@ -565,7 +565,7 @@ namespace BizHawk.Client.EmuHawk
Text = $"Text for branch {index + 1}", Text = $"Text for branch {index + 1}",
TextInputType = InputPrompt.InputType.Text, TextInputType = InputPrompt.InputType.Text,
Message = "Enter a message", Message = "Enter a message",
InitialValue = branch.UserText InitialValue = branch.UserText,
}; };
i.FollowMousePointer(); i.FollowMousePointer();

10
src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -169,10 +169,7 @@ namespace BizHawk.Client.EmuHawk
Text = $"Marker for frame {frame}", Text = $"Marker for frame {frame}",
TextInputType = InputPrompt.InputType.Text, TextInputType = InputPrompt.InputType.Text,
Message = "Enter a message", Message = "Enter a message",
InitialValue = InitialValue = Markers.IsMarker(frame) ? Markers.PreviousOrCurrent(frame).Message : string.Empty,
Markers.IsMarker(frame) ?
Markers.PreviousOrCurrent(frame).Message :
""
}; };
i.FollowMousePointer(); i.FollowMousePointer();
@ -214,10 +211,7 @@ namespace BizHawk.Client.EmuHawk
Text = $"Marker for frame {markerFrame}", Text = $"Marker for frame {markerFrame}",
TextInputType = InputPrompt.InputType.Text, TextInputType = InputPrompt.InputType.Text,
Message = "Enter a message", Message = "Enter a message",
InitialValue = InitialValue = Markers.IsMarker(markerFrame) ? Markers.PreviousOrCurrent(markerFrame).Message : string.Empty,
Markers.IsMarker(markerFrame)
? Markers.PreviousOrCurrent(markerFrame).Message
: ""
}; };
i.FollowMousePointer(); i.FollowMousePointer();

Some files were not shown because too many files have changed in this diff Show More