From 92db6b8b6430af42fe3b64d542c305e88b99cbc5 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 29 Apr 2020 19:39:18 -0500 Subject: [PATCH] Tastudio - try to sort out when to fully redraw tastudio vs update row count --- .../tools/TAStudio/TAStudio.IToolForm.cs | 2 +- .../tools/TAStudio/TAStudio.ListView.cs | 12 +++++------ .../tools/TAStudio/TAStudio.MenuItems.cs | 20 +++++++++---------- .../tools/TAStudio/TAStudio.cs | 4 ++-- 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs index 09637ddda5..024c0743be 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs @@ -87,7 +87,7 @@ namespace BizHawk.Client.EmuHawk TasView.AllColumns.Clear(); StartNewTasMovie(); SetUpColumns(); - RefreshTasView(); + TasView.Refresh(); } else { diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 843f8038a3..f7979f4633 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -424,10 +424,8 @@ namespace BizHawk.Client.EmuHawk private void TasView_ColumnRightClick(object sender, InputRoll.ColumnClickEventArgs e) { e.Column.Emphasis ^= true; - UpdateAutoFire(e.Column.Name, e.Column.Emphasis); - - RefreshTasView(); + TasView.Refresh(); } private void UpdateAutoFire() @@ -565,7 +563,7 @@ namespace BizHawk.Client.EmuHawk { _extraAxisRows.Clear(); AxisEditRow = -1; - RefreshTasView(); + SetTasViewRowCount(); } else { @@ -573,7 +571,7 @@ namespace BizHawk.Client.EmuHawk { _extraAxisRows.Clear(); AxisEditRow = frame; - RefreshTasView(); + SetTasViewRowCount(); } _axisEditYPos = e.Y; @@ -820,7 +818,7 @@ namespace BizHawk.Client.EmuHawk // if a loaded branch log is shorter than selection, keep selection until you attempt to call context menu // you might need it when you load again the branch where this frame exists TasView.DeselectAll(); - RefreshTasView(); + SetTasViewRowCount(); } else { @@ -1176,7 +1174,7 @@ namespace BizHawk.Client.EmuHawk TasView.MakeIndexVisible(TasView.CurrentCell.RowIndex.Value); // todo: limit scrolling speed } - RefreshTasView(); + SetTasViewRowCount(); } private void TasView_MouseMove(object sender, MouseEventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs index 3076438f4c..55d95812c2 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs @@ -388,13 +388,13 @@ namespace BizHawk.Client.EmuHawk private void DeselectMenuItem_Click(object sender, EventArgs e) { TasView.DeselectAll(); - RefreshTasView(); + TasView.Refresh(); } private void SelectAllMenuItem_Click(object sender, EventArgs e) { TasView.SelectAll(); - RefreshTasView(); + TasView.Refresh(); } private void SelectBetweenMarkersMenuItem_Click(object sender, EventArgs e) @@ -413,7 +413,7 @@ namespace BizHawk.Client.EmuHawk } SetSplicer(); - RefreshTasView(); + TasView.Refresh(); } } @@ -426,7 +426,7 @@ namespace BizHawk.Client.EmuHawk } SetSplicer(); - RefreshTasView(); + TasView.Refresh(); } private void CopyMenuItem_Click(object sender, EventArgs e) @@ -1303,7 +1303,7 @@ namespace BizHawk.Client.EmuHawk CurrentTasMovie.FlagChanges(); TasView.AllColumns.ColumnsChanged(); - RefreshTasView(); + TasView.Refresh(); }; ColumnsSubMenu.DropDownItems.Add(item); @@ -1330,7 +1330,7 @@ namespace BizHawk.Client.EmuHawk CurrentTasMovie.FlagChanges(); TasView.AllColumns.ColumnsChanged(); - RefreshTasView(); + TasView.Refresh(); }; ColumnsSubMenu.DropDownItems.Add(item); @@ -1345,9 +1345,9 @@ namespace BizHawk.Client.EmuHawk private void RestoreDefaults() { TasView.AllColumns.Clear(); - SetUpColumns(); - RefreshTasView(); - CurrentTasMovie.FlagChanges(); + SetUpColumns(); + TasView.Refresh(); + CurrentTasMovie.FlagChanges(); MainVertialSplit.SplitterDistance = _defaultMainSplitDistance; BranchesMarkersSplit.SplitterDistance = _defaultBranchMarkerSplitDistance; @@ -1402,7 +1402,7 @@ namespace BizHawk.Client.EmuHawk private void CancelSeekContextMenuItem_Click(object sender, EventArgs e) { MainForm.PauseOnFrame = null; - RefreshTasView(); + TasView.Refresh(); } private void BranchContextMenuItem_Click(object sender, EventArgs e) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index c8329d4e2a..845ffe83a3 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -921,7 +921,7 @@ namespace BizHawk.Client.EmuHawk if (refreshTasView) { - RefreshTasView(); + SetTasViewRowCount(); } MarkerControl?.UpdateValues(); @@ -937,7 +937,7 @@ namespace BizHawk.Client.EmuHawk } } - private void RefreshTasView() + private void SetTasViewRowCount() { TasView.RowCount = CurrentTasMovie.InputLogLength + 1; _lastRefresh = Emulator.Frame;