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

delete multitrack message position config values, and message config ui, also reposition thingsin message config and fix some positioining, hence designer barf

This commit is contained in:
adelikat 2020-06-29 10:32:04 -05:00
parent 1c82340cac
commit 452611477b
4 changed files with 587 additions and 629 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Client.Common/config/Config.cs
View File

@ -167,7 +167,6 @@ namespace BizHawk.Client.Common
public MessagePosition LagCounter { get; set; } = DefaultMessagePositions.LagCounter.Clone();
public MessagePosition InputDisplay { get; set; } = DefaultMessagePositions.InputDisplay.Clone();
public MessagePosition ReRecordCounter { get; set; } = DefaultMessagePositions.ReRecordCounter.Clone();
public MessagePosition MultitrackRecorder { get; set; } = DefaultMessagePositions.MultitrackRecorder.Clone();
public MessagePosition Messages { get; set; } = DefaultMessagePositions.Messages.Clone();
public MessagePosition Autohold { get; set; } = DefaultMessagePositions.Autohold.Clone();
public MessagePosition RamWatches { get; set; } = DefaultMessagePositions.RamWatches.Clone();

1
src/BizHawk.Client.Common/config/MessagePosition.cs
View File

@ -39,7 +39,6 @@
public static MessagePosition LagCounter = new MessagePosition { X = 0, Y = 42 };
public static MessagePosition InputDisplay = new MessagePosition { X = 0, Y = 28 };
public static MessagePosition ReRecordCounter = new MessagePosition { X = 0, Y = 56 };
public static MessagePosition MultitrackRecorder = new MessagePosition { X = 0, Y = 14, Anchor = MessagePosition.AnchorType.TopRight };
public static MessagePosition Messages = new MessagePosition { X = 0, Y = 0, Anchor = MessagePosition.AnchorType.BottomLeft };
public static MessagePosition Autohold = new MessagePosition { X = 0, Y = 0, Anchor = MessagePosition.AnchorType.TopRight };
public static MessagePosition RamWatches = new MessagePosition { X = 0, Y = 70 };

1197
src/BizHawk.Client.EmuHawk/config/MessageConfig.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

17
src/BizHawk.Client.EmuHawk/config/MessageConfig.cs
View File

@ -16,7 +16,6 @@ namespace BizHawk.Client.EmuHawk
private MessagePosition _lagCounter;
private MessagePosition _inputDisplay;
private MessagePosition _reRecordCounter;
private MessagePosition _multitrackRecorder;
private MessagePosition _messages;
private MessagePosition _autohold;
private MessagePosition _ramWatches;
@ -40,7 +39,6 @@ namespace BizHawk.Client.EmuHawk
_lagCounter = _config.LagCounter.Clone();
_inputDisplay = _config.InputDisplay.Clone();
_reRecordCounter = _config.ReRecordCounter.Clone();
_multitrackRecorder = _config.MultitrackRecorder.Clone();
_messages = _config.Messages.Clone();
_autohold = _config.Autohold.Clone();
_ramWatches = _config.RamWatches.Clone();
@ -154,10 +152,6 @@ namespace BizHawk.Client.EmuHawk
{
SetFromOption(_reRecordCounter);
}
else if (MultitrackRadio.Checked)
{
SetFromOption(_multitrackRecorder);
}
else if (AutoholdRadio.Checked)
{
SetFromOption(_autohold);
@ -176,7 +170,6 @@ namespace BizHawk.Client.EmuHawk
_config.LagCounter = _lagCounter;
_config.InputDisplay = _inputDisplay;
_config.ReRecordCounter = _reRecordCounter;
_config.MultitrackRecorder = _multitrackRecorder;
_config.Messages = _messages;
_config.Autohold = _autohold;
_config.RamWatches = _ramWatches;
@ -333,10 +326,6 @@ namespace BizHawk.Client.EmuHawk
{
SetOptionPosition(_reRecordCounter);
}
else if (MultitrackRadio.Checked)
{
SetOptionPosition(_multitrackRecorder);
}
else if (MessagesRadio.Checked)
{
SetOptionPosition(_messages);
@ -352,7 +341,6 @@ namespace BizHawk.Client.EmuHawk
InpLabel.Text = ToCoordinateStr(_inputDisplay);
WatchesLabel.Text = ToCoordinateStr(_ramWatches);
RerecLabel.Text = ToCoordinateStr(_reRecordCounter);
MultitrackLabel.Text = ToCoordinateStr(_multitrackRecorder);
MessLabel.Text = ToCoordinateStr(_messages);
AutoholdLabel.Text = ToCoordinateStr(_autohold);
}
@ -369,7 +357,6 @@ namespace BizHawk.Client.EmuHawk
_lagCounter = _config.LagCounter = DefaultMessagePositions.LagCounter.Clone();
_inputDisplay = _config.InputDisplay = DefaultMessagePositions.InputDisplay.Clone();
_reRecordCounter = _config.ReRecordCounter = DefaultMessagePositions.ReRecordCounter.Clone();
_multitrackRecorder = _config.MultitrackRecorder = DefaultMessagePositions.MultitrackRecorder.Clone();
_messages = _config.Messages = DefaultMessagePositions.Messages.Clone();
_autohold = _config.Autohold = DefaultMessagePositions.Autohold.Clone();
_ramWatches = _config.RamWatches = DefaultMessagePositions.RamWatches.Clone();
@ -421,10 +408,6 @@ namespace BizHawk.Client.EmuHawk
{
_reRecordCounter.Anchor = value;
}
else if (MultitrackRadio.Checked)
{
_multitrackRecorder.Anchor = value;
}
else if (AutoholdRadio.Checked)
{
_autohold.Anchor = value;