Tastudio - change color drawing a bit, don't color differently for whether or not there's a state for that frame, only key off the lag (which will adequately tell you if it is an "emulated" frame or not. In developer builds, color the marker column differently for easier debugging of TasStateManager logic

This commit is contained in:
adelikat 2014-09-22 21:47:07 +00:00
parent f9baa5e8e4
commit 5ae547d89f
1 changed files with 8 additions and 25 deletions

View File

@ -31,12 +31,6 @@ namespace BizHawk.Client.EmuHawk
public static Color LagZone_InputLog = Color.FromArgb(0xF0D0D2);
public static Color LagZone_Invalidated_InputLog = Color.FromArgb(0xF7E5E5);
public static Color NoState_GreenZone_FrameCol = Color.FromArgb(0xF9FFF9);
public static Color NoState_GreenZone_InputLog = Color.FromArgb(0xE0FBE0);
public static Color NoState_LagZone_FrameCol = Color.FromArgb(0xFFE9E9);
public static Color NoState_LagZone_InputLog = Color.FromArgb(0xF0D0D2);
public static Color Marker_FrameCol = Color.FromArgb(0xF7FFC9);
#region Query callbacks
@ -86,29 +80,18 @@ namespace BizHawk.Client.EmuHawk
private void TasView_QueryItemBkColor(int index, int column, ref Color color)
{
var columnName = TasView.Columns[column].Name;
var record = _currentTasMovie[index];
// Marker Column is white regardless
if (columnName == MarkerColumnName)
{
color = Color.White;
return;
}
// "pending" frame logic
if (index == Global.Emulator.Frame && index == _currentTasMovie.InputLogLength)
{
if (columnName == FrameColumnName)
if (VersionInfo.DeveloperBuild) // For debugging purposes, let's visually show the state frames
{
color = CurrentFrame_FrameCol;
color = (record.HasState ? color = Color.FromArgb(0xEEEEEE) : Color.White);
}
color = CurrentFrame_InputLog;
return;
}
var record = _currentTasMovie[index];
if (columnName == FrameColumnName)
{
if (Global.Emulator.Frame == index)
@ -123,11 +106,11 @@ namespace BizHawk.Client.EmuHawk
{
if (record.Lagged.Value)
{
color = record.HasState ? LagZone_FrameCol : NoState_LagZone_InputLog;
color = LagZone_FrameCol;
}
else
{
color = record.HasState ? GreenZone_FrameCol : NoState_GreenZone_FrameCol;
color = GreenZone_FrameCol;
}
}
else
@ -147,12 +130,12 @@ namespace BizHawk.Client.EmuHawk
{
if (record.Lagged.Value)
{
color = record.HasState ? LagZone_InputLog : NoState_LagZone_InputLog;
color = LagZone_InputLog;
}
else
{
color = record.HasState ? GreenZone_InputLog : NoState_GreenZone_InputLog;
color = GreenZone_InputLog;
}
}
else