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

Rename MovieInput to MovieInputColor 

this makes it consistent with the three other variables
This commit is contained in:
Morilli 2024-09-15 14:54:32 +02:00
parent 08fab86807
commit 75c8b8ed9a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,12 +237,12 @@ namespace BizHawk.Client.Common
{ {
var input = InputStrMovie(); var input = InputStrMovie();
var point = GetCoordinates(g, _config.InputDisplay, input); var point = GetCoordinates(g, _config.InputDisplay, input);
var c = Color.FromArgb(_config.MovieInput); var c = Color.FromArgb(_config.MovieInputColor);
g.DrawString(input, c, point.X, point.Y); g.DrawString(input, c, point.X, point.Y);
} }
else // TODO: message config -- allow setting of "mixed", and "auto" else // TODO: message config -- allow setting of "mixed", and "auto"
{ {
var previousColor = _movieSession.Movie.IsRecording() ? Color.FromArgb(_config.LastInputColor) : Color.FromArgb(_config.MovieInput); var previousColor = _movieSession.Movie.IsRecording() ? Color.FromArgb(_config.LastInputColor) : Color.FromArgb(_config.MovieInputColor);
var currentColor = Color.FromArgb(_config.MessagesColor); var currentColor = Color.FromArgb(_config.MessagesColor);
var stickyColor = Color.Pink; var stickyColor = Color.Pink;
var currentAndPreviousColor = Color.PeachPuff; var currentAndPreviousColor = Color.PeachPuff;

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

@ -248,7 +248,7 @@ namespace BizHawk.Client.Common
public int MessagesColor { get; set; } = DefaultMessagePositions.MessagesColor; public int MessagesColor { get; set; } = DefaultMessagePositions.MessagesColor;
public int AlertMessageColor { get; set; } = DefaultMessagePositions.AlertMessageColor; public int AlertMessageColor { get; set; } = DefaultMessagePositions.AlertMessageColor;
public int LastInputColor { get; set; } = DefaultMessagePositions.LastInputColor; public int LastInputColor { get; set; } = DefaultMessagePositions.LastInputColor;
public int MovieInput { get; set; } = DefaultMessagePositions.MovieInput; public int MovieInputColor { get; set; } = DefaultMessagePositions.MovieInputColor;
public int DispPrescale { get; set; } = 1; public int DispPrescale { get; set; } = 1;

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

@ -49,6 +49,6 @@
MessagesColor = -1, MessagesColor = -1,
AlertMessageColor = -65536, AlertMessageColor = -65536,
LastInputColor = -23296, LastInputColor = -23296,
MovieInput = -8355712; MovieInputColor = -8355712;
} }
} }

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

@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk
["Main Messages"] = _config.MessagesColor, ["Main Messages"] = _config.MessagesColor,
["Alert Messages"] = _config.AlertMessageColor, ["Alert Messages"] = _config.AlertMessageColor,
["Previous Frame Input"] = _config.LastInputColor, ["Previous Frame Input"] = _config.LastInputColor,
["Movie Input"] = _config.MovieInput ["Movie Input"] = _config.MovieInputColor
}; };
private IEnumerable<ColorRow> ColorRows => ColorBox.Controls.OfType<ColorRow>(); private IEnumerable<ColorRow> ColorRows => ColorBox.Controls.OfType<ColorRow>();
@ -154,7 +154,7 @@ namespace BizHawk.Client.EmuHawk
_config.MessagesColor = ColorRows.Single(r => r.Name == "Main Messages").SelectedColor; _config.MessagesColor = ColorRows.Single(r => r.Name == "Main Messages").SelectedColor;
_config.AlertMessageColor = ColorRows.Single(r => r.Name == "Alert Messages").SelectedColor; _config.AlertMessageColor = ColorRows.Single(r => r.Name == "Alert Messages").SelectedColor;
_config.LastInputColor = ColorRows.Single(r => r.Name == "Previous Frame Input").SelectedColor; _config.LastInputColor = ColorRows.Single(r => r.Name == "Previous Frame Input").SelectedColor;
_config.MovieInput = ColorRows.Single(r => r.Name == "Movie Input").SelectedColor; _config.MovieInputColor = ColorRows.Single(r => r.Name == "Movie Input").SelectedColor;
_config.OSDMessageDuration = (int) _nudDuration.Value; _config.OSDMessageDuration = (int) _nudDuration.Value;
_config.StackOSDMessages = StackMessagesCheckbox.Checked; _config.StackOSDMessages = StackMessagesCheckbox.Checked;
@ -180,7 +180,7 @@ namespace BizHawk.Client.EmuHawk
ColorRows.Single(r => r.Name == "Main Messages").SelectedColor = DefaultMessagePositions.MessagesColor; ColorRows.Single(r => r.Name == "Main Messages").SelectedColor = DefaultMessagePositions.MessagesColor;
ColorRows.Single(r => r.Name == "Alert Messages").SelectedColor = DefaultMessagePositions.AlertMessageColor; ColorRows.Single(r => r.Name == "Alert Messages").SelectedColor = DefaultMessagePositions.AlertMessageColor;
ColorRows.Single(r => r.Name == "Previous Frame Input").SelectedColor = DefaultMessagePositions.LastInputColor; ColorRows.Single(r => r.Name == "Previous Frame Input").SelectedColor = DefaultMessagePositions.LastInputColor;
ColorRows.Single(r => r.Name == "Movie Input").SelectedColor = DefaultMessagePositions.MovieInput; ColorRows.Single(r => r.Name == "Movie Input").SelectedColor = DefaultMessagePositions.MovieInputColor;
CreateMessageRows(); CreateMessageRows();
StackMessagesCheckbox.Checked = true; StackMessagesCheckbox.Checked = true;