From 9203f56eca45ea36bdea47cb3ea8ad19053e2ec7 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 29 Apr 2020 19:17:44 -0500
Subject: [PATCH] tastudio - consolidate logic and always draw column emphasis
 (to show sticky state) when setting up columns, rather than only on load

---
 .../tools/TAStudio/TAStudio.cs                | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index a8edaa2575..c8329d4e2a 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -154,8 +154,6 @@ namespace BizHawk.Client.EmuHawk
 				return;
 			}
 
-			SetColumnsFromCurrentStickies();
-
 			if (TasView.Rotatable)
 			{
 				RightClickMenu.Items.AddRange(TasView.GenerateContextMenuItems()
@@ -426,7 +424,7 @@ namespace BizHawk.Client.EmuHawk
 				int digits;
 				if (ControllerType.AxisControls.Contains(kvp.Key))
 				{
-					ControllerDefinition.AxisRange range = ControllerType.AxisRanges
+					var range = ControllerType.AxisRanges
 						[ControllerType.AxisControls.IndexOf(kvp.Key)];
 					type = ColumnType.Float;
 					digits = Math.Max(kvp.Value.Length, range.MaxDigits);
@@ -473,8 +471,15 @@ namespace BizHawk.Client.EmuHawk
 				column.Visible = false;
 			}
 
-			TasView.AllColumns.ColumnsChanged();
+			foreach (var column in TasView.VisibleColumns)
+			{
+				if (Global.InputManager.StickyXorAdapter.IsSticky(column.Name))
+				{
+					column.Emphasis = true;
+				}
+			}
 
+			TasView.AllColumns.ColumnsChanged();
 			SetupBoolPatterns();
 		}
 
@@ -775,17 +780,6 @@ namespace BizHawk.Client.EmuHawk
 			loadZone.PlaceZone(CurrentTasMovie);
 		}
 
-		private void SetColumnsFromCurrentStickies()
-		{
-			foreach (var column in TasView.VisibleColumns)
-			{
-				if (Global.InputManager.StickyXorAdapter.IsSticky(column.Name))
-				{
-					column.Emphasis = true;
-				}
-			}
-		}
-
 		#endregion
 
 		private void TastudioPlayMode()