tastudio - consolidate logic and always draw column emphasis (to show sticky state) when setting up columns, rather than only on load

This commit is contained in:
adelikat 2020-04-29 19:17:44 -05:00
parent 5252598aef
commit 9203f56eca
1 changed files with 9 additions and 15 deletions

View File

@ -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()