diff --git a/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs b/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs index 8078871c05..5bf7ee8442 100644 --- a/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs +++ b/src/BizHawk.Client.Common/DisplayManager/OSDManager.cs @@ -237,12 +237,12 @@ namespace BizHawk.Client.Common { var input = InputStrMovie(); 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); } 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 stickyColor = Color.Pink; var currentAndPreviousColor = Color.PeachPuff; diff --git a/src/BizHawk.Client.Common/config/Config.cs b/src/BizHawk.Client.Common/config/Config.cs index 978734440c..0db56d063d 100644 --- a/src/BizHawk.Client.Common/config/Config.cs +++ b/src/BizHawk.Client.Common/config/Config.cs @@ -248,7 +248,7 @@ namespace BizHawk.Client.Common public int MessagesColor { get; set; } = DefaultMessagePositions.MessagesColor; public int AlertMessageColor { get; set; } = DefaultMessagePositions.AlertMessageColor; 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; diff --git a/src/BizHawk.Client.Common/config/MessagePosition.cs b/src/BizHawk.Client.Common/config/MessagePosition.cs index 039b3f24c7..7a873b5dd1 100644 --- a/src/BizHawk.Client.Common/config/MessagePosition.cs +++ b/src/BizHawk.Client.Common/config/MessagePosition.cs @@ -49,6 +49,6 @@ MessagesColor = -1, AlertMessageColor = -65536, LastInputColor = -23296, - MovieInput = -8355712; + MovieInputColor = -8355712; } } diff --git a/src/BizHawk.Client.EmuHawk/config/Messages/MessageConfig.cs b/src/BizHawk.Client.EmuHawk/config/Messages/MessageConfig.cs index 548db1dc0c..4b6918580b 100644 --- a/src/BizHawk.Client.EmuHawk/config/Messages/MessageConfig.cs +++ b/src/BizHawk.Client.EmuHawk/config/Messages/MessageConfig.cs @@ -40,7 +40,7 @@ namespace BizHawk.Client.EmuHawk ["Main Messages"] = _config.MessagesColor, ["Alert Messages"] = _config.AlertMessageColor, ["Previous Frame Input"] = _config.LastInputColor, - ["Movie Input"] = _config.MovieInput + ["Movie Input"] = _config.MovieInputColor }; 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.AlertMessageColor = ColorRows.Single(r => r.Name == "Alert Messages").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.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 == "Alert Messages").SelectedColor = DefaultMessagePositions.AlertMessageColor; 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(); StackMessagesCheckbox.Checked = true;