From 12adf89ca1e6222cd5fbc0ba4ca2ba1b218d2916 Mon Sep 17 00:00:00 2001 From: "andres.delikat" Date: Fri, 13 May 2011 20:19:12 +0000 Subject: [PATCH] On movie playback - input display = gray (todo: make the color configurable in message config --- BizHawk.MultiClient/MainForm.cs | 3 +-- BizHawk.MultiClient/RenderPanel.cs | 10 +++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs index 15c7fc2406..1cf836ce8b 100644 --- a/BizHawk.MultiClient/MainForm.cs +++ b/BizHawk.MultiClient/MainForm.cs @@ -992,8 +992,7 @@ namespace BizHawk.MultiClient if (!runloop_frameadvance) genSound = true; else if (!Global.Config.MuteFrameAdvance) genSound = true; - - //TODO: clean up this movie code, use a function or an object to manage the togglign of two movies + if (MovieActive()) { Movie m = GetActiveMovie(); diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs index 7ba8758248..3607dcae1e 100644 --- a/BizHawk.MultiClient/RenderPanel.cs +++ b/BizHawk.MultiClient/RenderPanel.cs @@ -268,10 +268,18 @@ namespace BizHawk.MultiClient if (Global.Config.DisplayInput) { string input = MakeLastInputDisplay(); + Color c; + if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.PLAY) + { + c = Color.Gray; + } + else + c = Color.FromArgb(Global.Config.MessagesColor); + MessageFont.DrawString(null, input, Global.Config.DispInpx+2, Global.Config.DispInpy+2, new Color4(Color.Black)); MessageFont.DrawString(null, input, Global.Config.DispInpx+1, Global.Config.DispInpy+1, Color.FromArgb(Global.Config.LastInputColor)); input = MakeInputDisplay(); - MessageFont.DrawString(null, input, Global.Config.DispInpx, Global.Config.DispInpy, Color.FromArgb(Global.Config.MessagesColor)); + MessageFont.DrawString(null, input, Global.Config.DispInpx, Global.Config.DispInpy, c); } if (Global.Config.DisplayFPS)