From e5c2e7ce4bd835e8631dbb5b554e170020260708 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Thu, 7 Oct 2021 08:50:01 -0400 Subject: [PATCH] TAStudio: Fix #2811 NOTE: I am leaving a TODO in InputRoll, there are some complicated bugs happening with pointed cell updates, but for now everything happens to work out ok. --- .../CustomControls/InputRoll/InputRoll.cs | 17 +++++++++++------ .../tools/TAStudio/TAStudio.ListView.cs | 4 ++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index 19aecfdce5..917ce76702 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -9,6 +9,9 @@ using BizHawk.Client.Common; using BizHawk.Client.EmuHawk.CustomControls; using BizHawk.Common; +// TODO: There are some bad interactions between ScrollToIndex and MakeIndexVisible that are preventing things from working as intended. +// But, the current behaviour is ok for now for what it is used for. + namespace BizHawk.Client.EmuHawk { // Row width depends on font size and padding @@ -710,7 +713,7 @@ namespace BizHawk.Client.EmuHawk _programmaticallyUpdatingScrollBarValues = false; } } - + _programmaticallyChangingRow = false; PointMouseToNewCell(); } } @@ -785,7 +788,7 @@ namespace BizHawk.Client.EmuHawk } while (!range.Contains(lastVisible - value) && FirstVisibleRow != 0); } - + _programmaticallyChangingRow = false; PointMouseToNewCell(); } } @@ -889,11 +892,12 @@ namespace BizHawk.Client.EmuHawk } } } - + _programmaticallyChangingRow = false; PointMouseToNewCell(); } - private bool _programmaticallyChangingRow = false; + public bool _programmaticallyChangingRow = false; + /// /// Scrolls so that the given index is visible, if it isn't already; doesn't use scroll settings. /// @@ -902,6 +906,7 @@ namespace BizHawk.Client.EmuHawk if (!IsVisible(index)) { _programmaticallyChangingRow = true; + if (FirstVisibleRow > index) { FirstVisibleRow = index; @@ -948,7 +953,7 @@ namespace BizHawk.Client.EmuHawk // It's necessary to call this anytime the control is programmatically scrolled // Since the mouse may not be pointing to the same cell anymore - private void PointMouseToNewCell() + public void PointMouseToNewCell() { if (_currentX.HasValue && _currentY.HasValue) { @@ -966,7 +971,7 @@ namespace BizHawk.Client.EmuHawk newCell.RowIndex = 0; } - if (!_programmaticallyChangingRow) + if (_programmaticallyChangingRow) { _programmaticallyChangingRow = false; CellChanged(newCell); diff --git a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs index 46b8b4e7f4..e4ab397c3e 100644 --- a/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs +++ b/src/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.ListView.cs @@ -539,6 +539,10 @@ namespace BizHawk.Client.EmuHawk return; } + // only on mouse button down, check that the pointed to cell is the correct one (can be wrong due to scroll while playing) + TasView._programmaticallyChangingRow = true; + TasView.PointMouseToNewCell(); + if (e.Button == MouseButtons.Middle) { if (MainForm.EmulatorPaused)