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

Input display: At movie end, show both last movie inputs and current inputs; fixes #2295 (#2305)

This commit is contained in:
RetroEdit 2020-08-14 15:49:06 +00:00 committed by GitHub
parent 5ea32b875b
commit e89449ed27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -271,8 +271,10 @@ namespace BizHawk.Client.EmuHawk
if (GlobalWin.Config.DisplayInput) if (GlobalWin.Config.DisplayInput)
{ {
if (GlobalWin.MovieSession.Movie.IsPlaying() var moviePlaying = GlobalWin.MovieSession.Movie.IsPlaying();
|| (GlobalWin.MovieSession.Movie.IsFinished() && GlobalWin.Emulator.Frame == GlobalWin.MovieSession.Movie.InputLogLength)) // Account for the last frame of the movie, the movie state is immediately "Finished" here but we still want to show the input // After the last frame of the movie, we want both the last movie input and the current inputs.
var atMovieEnd = (GlobalWin.MovieSession.Movie.IsFinished() && GlobalWin.Emulator.Frame == GlobalWin.MovieSession.Movie.InputLogLength);
if (moviePlaying || atMovieEnd)
{ {
var input = InputStrMovie(); var input = InputStrMovie();
var point = GetCoordinates(g, GlobalWin.Config.InputDisplay, input); var point = GetCoordinates(g, GlobalWin.Config.InputDisplay, input);
@ -280,7 +282,7 @@ namespace BizHawk.Client.EmuHawk
g.DrawString(input, MessageFont, c, point.X, point.Y); g.DrawString(input, MessageFont, c, point.X, point.Y);
} }
else // TODO: message config -- allow setting of "mixed", and "auto" if (!moviePlaying) // TODO: message config -- allow setting of "mixed", and "auto"
{ {
var previousColor = Color.FromArgb(GlobalWin.Config.LastInputColor); var previousColor = Color.FromArgb(GlobalWin.Config.LastInputColor);
Color immediateColor = Color.FromArgb(GlobalWin.Config.MessagesColor); Color immediateColor = Color.FromArgb(GlobalWin.Config.MessagesColor);