From 90c489beedfbfd62728e4aa8d82cd2930c8e01e0 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Fri, 19 Nov 2021 03:24:15 +1000 Subject: [PATCH] Move TAStudio colours into a struct and save it to config --- .../tools/TAStudio/BookmarksBranchesBox.cs | 6 +- .../tools/TAStudio/MarkerControl.cs | 10 ++- .../tools/TAStudio/TAStudio.ListView.cs | 39 +++------ .../tools/TAStudio/TAStudio.cs | 5 ++ .../tools/TAStudio/TAStudioPalette.cs | 81 +++++++++++++++++++ .../tools/TAStudio/UndoHistoryForm.cs | 4 +- 6 files changed, 109 insertions(+), 36 deletions(-) create mode 100644 src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioPalette.cs diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs index 2b7e6d896b..1493e017de 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/BookmarksBranchesBox.cs @@ -131,13 +131,13 @@ namespace BizHawk.Client.EmuHawk var record = Movie[branch.Frame]; if (index == Branches.Current) { - color = TAStudio.CurrentFrame_InputLog; + color = Tastudio.Palette.CurrentFrame_InputLog; } else if (record.Lagged.HasValue) { color = record.Lagged.Value - ? TAStudio.LagZone_InputLog - : TAStudio.GreenZone_InputLog; + ? Tastudio.Palette.LagZone_InputLog + : Tastudio.Palette.GreenZone_InputLog; } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs index b69dd4ccfc..9261ca38f8 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs @@ -73,7 +73,7 @@ namespace BizHawk.Client.EmuHawk if (prev != null && index == Markers.IndexOf(prev)) { // feos: taseditor doesn't have it, so we're free to set arbitrary color scheme. and I prefer consistency - color = TAStudio.CurrentFrame_InputLog; + color = Tastudio.Palette.CurrentFrame_InputLog; } else if (index < Markers.Count) { @@ -84,11 +84,15 @@ namespace BizHawk.Client.EmuHawk { if (record.Lagged.Value) { - color = column.Name == "FrameColumn" ? TAStudio.LagZone_FrameCol : TAStudio.LagZone_InputLog; + color = column.Name == "FrameColumn" + ? Tastudio.Palette.LagZone_FrameCol + : Tastudio.Palette.LagZone_InputLog; } else { - color = column.Name == "LabelColumn" ? TAStudio.GreenZone_FrameCol : TAStudio.GreenZone_InputLog; + color = column.Name == "LabelColumn" + ? Tastudio.Palette.GreenZone_FrameCol + : Tastudio.Palette.GreenZone_InputLog; } } } diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index bdee92c435..6c70c42b5f 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -126,23 +126,6 @@ namespace BizHawk.Client.EmuHawk } } - // public static Color CurrentFrame_FrameCol = Color.FromArgb(0xCF, 0xED, 0xFC); Why? - public static Color CurrentFrame_InputLog => Color.FromArgb(0xB5, 0xE7, 0xF7); - public static Color SeekFrame_InputLog => Color.FromArgb(0x70, 0xB5, 0xE7, 0xF7); - - public static Color GreenZone_FrameCol => Color.FromArgb(0xDD, 0xFF, 0xDD); - public static Color GreenZone_InputLog => Color.FromArgb(0xD2, 0xF9, 0xD3); - public static Color GreenZone_InputLog_Stated => Color.FromArgb(0xC4, 0xF7, 0xC8); - public static Color GreenZone_InputLog_Invalidated => Color.FromArgb(0xE0, 0xFB, 0xE0); - - public static Color LagZone_FrameCol => Color.FromArgb(0xFF, 0xDC, 0xDD); - public static Color LagZone_InputLog => Color.FromArgb(0xF4, 0xDA, 0xDA); - public static Color LagZone_InputLog_Stated => Color.FromArgb(0xF0, 0xD0, 0xD2); - public static Color LagZone_InputLog_Invalidated => Color.FromArgb(0xF7, 0xE5, 0xE5); - - public static Color Marker_FrameCol => Color.FromArgb(0xF7, 0xFF, 0xC9); - public static Color AnalogEdit_Col => Color.FromArgb(0x90, 0x90, 0x70); // SuuperW: When editing an analog value, it will be a gray color. - private Bitmap ts_v_arrow_green_blue => Properties.Resources.ts_v_arrow_green_blue; private Bitmap ts_h_arrow_green_blue => Properties.Resources.ts_h_arrow_green_blue; private Bitmap ts_v_arrow_blue => Properties.Resources.ts_v_arrow_blue; @@ -248,7 +231,7 @@ namespace BizHawk.Client.EmuHawk { if (Emulator.Frame != index && CurrentTasMovie.Markers.IsMarker(index) && Settings.DenoteMarkersWithBGColor) { - color = Marker_FrameCol; + color = Palette.Marker_FrameCol; } else { @@ -259,7 +242,7 @@ namespace BizHawk.Client.EmuHawk && (index == _axisEditRow || _extraAxisRows.Contains(index)) && columnName == _axisEditColumn) { - color = AnalogEdit_Col; + color = Palette.AnalogEdit_Col; } int player = Emulator.ControllerDefinition.PlayerNumber(columnName); @@ -280,32 +263,32 @@ namespace BizHawk.Client.EmuHawk if (MainForm.IsSeeking && MainForm.PauseOnFrame == index) { - color = CurrentFrame_InputLog; + color = Palette.CurrentFrame_InputLog; } else if (!MainForm.IsSeeking && Emulator.Frame == index) { - color = CurrentFrame_InputLog; + color = Palette.CurrentFrame_InputLog; } else if (record.Lagged.HasValue) { if (!record.HasState && Settings.DenoteStatesWithBGColor) { color = record.Lagged.Value - ? LagZone_InputLog - : GreenZone_InputLog; + ? Palette.LagZone_InputLog + : Palette.GreenZone_InputLog; } else { color = record.Lagged.Value - ? LagZone_InputLog_Stated - : GreenZone_InputLog_Stated; + ? Palette.LagZone_InputLog_Stated + : Palette.GreenZone_InputLog_Stated; } } else if (record.WasLagged.HasValue) { - color = record.WasLagged.Value ? - LagZone_InputLog_Invalidated : - GreenZone_InputLog_Invalidated; + color = record.WasLagged.Value + ? Palette.LagZone_InputLog_Invalidated + : Palette.GreenZone_InputLog_Invalidated; } else { diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index e888f84974..405b137215 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -53,6 +53,8 @@ namespace BizHawk.Client.EmuHawk [ConfigPersist] public TAStudioSettings Settings { get; set; } = new TAStudioSettings(); + public TAStudioPalette Palette => Settings.Palette; + [ConfigPersist] public Font TasViewFont { get; set; } = new Font("Arial", 8.25F, FontStyle.Bold, GraphicsUnit.Point, 0); @@ -82,6 +84,8 @@ namespace BizHawk.Client.EmuHawk DenoteStatesWithBGColor = true; DenoteMarkersWithIcons = false; DenoteMarkersWithBGColor = true; + + Palette = TAStudioPalette.Default; } public RecentFiles RecentTas { get; set; } @@ -109,6 +113,7 @@ namespace BizHawk.Client.EmuHawk public int BranchMarkerSplitDistance { get; set; } public bool BindMarkersToInput { get; set; } public bool CopyIncludesFrameNo { get; set; } + public TAStudioPalette Palette { get; set; } } public TAStudio() diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioPalette.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioPalette.cs new file mode 100644 index 0000000000..fc3936558b --- /dev/null +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudioPalette.cs @@ -0,0 +1,81 @@ +using System.Drawing; + +namespace BizHawk.Client.EmuHawk +{ + /// + /// TODO these colours are obviously related in some way, calculate the lighter/darker shades from a base colour + /// (I've already used CurrentFrame_InputLog in the definition of SeekFrame_InputLog, they differed only in alpha) + /// --yoshi + /// + public readonly struct TAStudioPalette + { + public static TAStudioPalette Default = new( +// currentFrame_FrameCol: Color.FromArgb(0xCF, 0xED, 0xFC), + currentFrame_InputLog: Color.FromArgb(0xB5, 0xE7, 0xF7), + greenZone_FrameCol: Color.FromArgb(0xDD, 0xFF, 0xDD), + greenZone_InputLog: Color.FromArgb(0xD2, 0xF9, 0xD3), + greenZone_InputLog_Stated: Color.FromArgb(0xC4, 0xF7, 0xC8), + greenZone_InputLog_Invalidated: Color.FromArgb(0xE0, 0xFB, 0xE0), + lagZone_FrameCol: Color.FromArgb(0xFF, 0xDC, 0xDD), + lagZone_InputLog: Color.FromArgb(0xF4, 0xDA, 0xDA), + lagZone_InputLog_Stated: Color.FromArgb(0xF0, 0xD0, 0xD2), + lagZone_InputLog_Invalidated: Color.FromArgb(0xF7, 0xE5, 0xE5), + marker_FrameCol: Color.FromArgb(0xF7, 0xFF, 0xC9), + analogEdit_Col: Color.FromArgb(0x90, 0x90, 0x70)); // SuuperW: When editing an analog value, it will be a gray color. + +// public readonly Color CurrentFrame_FrameCol; + + public readonly Color CurrentFrame_InputLog; + +// public readonly Color SeekFrame_InputLog; + + public readonly Color GreenZone_FrameCol; + + public readonly Color GreenZone_InputLog; + + public readonly Color GreenZone_InputLog_Stated; + + public readonly Color GreenZone_InputLog_Invalidated; + + public readonly Color LagZone_FrameCol; + + public readonly Color LagZone_InputLog; + + public readonly Color LagZone_InputLog_Stated; + + public readonly Color LagZone_InputLog_Invalidated; + + public readonly Color Marker_FrameCol; + + public readonly Color AnalogEdit_Col; + + public TAStudioPalette( +// Color currentFrame_FrameCol, + Color currentFrame_InputLog, + Color greenZone_FrameCol, + Color greenZone_InputLog, + Color greenZone_InputLog_Stated, + Color greenZone_InputLog_Invalidated, + Color lagZone_FrameCol, + Color lagZone_InputLog, + Color lagZone_InputLog_Stated, + Color lagZone_InputLog_Invalidated, + Color marker_FrameCol, + Color analogEdit_Col) + { +// CurrentFrame_FrameCol = currentFrame_FrameCol; + CurrentFrame_InputLog = currentFrame_InputLog; +// SeekFrame_InputLog = Color.FromArgb(0x70, currentFrame_InputLog); + GreenZone_FrameCol = greenZone_FrameCol; + GreenZone_InputLog = greenZone_InputLog; + GreenZone_InputLog_Stated = greenZone_InputLog_Stated; + GreenZone_InputLog_Invalidated = greenZone_InputLog_Invalidated; + LagZone_FrameCol = lagZone_FrameCol; + LagZone_InputLog = lagZone_InputLog; + LagZone_InputLog_Stated = lagZone_InputLog_Stated; + LagZone_InputLog_Invalidated = lagZone_InputLog_Invalidated; + Marker_FrameCol = marker_FrameCol; + AnalogEdit_Col = analogEdit_Col; + } + } +} diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs index 2f4750d9df..ccc3318a72 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/UndoHistoryForm.cs @@ -44,11 +44,11 @@ namespace BizHawk.Client.EmuHawk { if (index == Log.UndoIndex) { - color = TAStudio.GreenZone_InputLog; + color = _tastudio.Palette.GreenZone_InputLog; } else if (index > Log.UndoIndex) { - color = TAStudio.LagZone_InputLog; + color = _tastudio.Palette.LagZone_InputLog; } }