From 5681368e13ad561377a87f26afdc23a653131436 Mon Sep 17 00:00:00 2001 From: adelikat Date: Thu, 10 Jul 2014 19:24:21 +0000 Subject: [PATCH] TAStudio - background coloring based on lag log and greenzone --- .../movie/tasproj/TasMovie.cs | 2 +- .../movie/tasproj/TasMovieRecord.cs | 2 +- .../tools/TAStudio/TAStudio.ListView.cs | 21 ++++++++++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs index 708efb87cb..4f01a7fcdd 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovie.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovie.cs @@ -38,7 +38,7 @@ namespace BizHawk.Client.Common { State = StateManager[index], LogEntry = GetInput(index), - Lagged = (index < LagLog.Count) ? LagLog[index] : false + Lagged = (index < LagLog.Count) ? LagLog[index] : (bool?)null }; } } diff --git a/BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs b/BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs index 9f474d59c0..d027a729fd 100644 --- a/BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs +++ b/BizHawk.Client.Common/movie/tasproj/TasMovieRecord.cs @@ -6,7 +6,7 @@ namespace BizHawk.Client.Common public class TasMovieRecord { public byte[] State { get; set; } - public bool Lagged { get; set; } + public bool? Lagged { get; set; } public string LogEntry { get; set; } public bool HasState diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index a78deb7af8..a5aab64ee4 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -17,13 +17,24 @@ namespace BizHawk.Client.EmuHawk { color = Color.LightBlue; } - else if (!record.HasState) - { - color = BackColor; - } else { - color = record.Lagged ? Color.Pink : Color.LightGreen; + if (record.Lagged.HasValue) + { + if (record.Lagged.Value) + { + color = record.HasState ? Color.LightGreen : + Color.FromArgb(Color.LightGreen.ToArgb() + 0x00111100); + } + else + { + color = record.HasState ? Color.Pink : Color.LightPink; + } + } + else + { + color = Color.White; + } } }