diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs index 48d458bce6..07a5b6ffd8 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs @@ -1042,7 +1042,6 @@ namespace BizHawk.Client.EmuHawk { if (ModifierKeys == Keys.Alt) { - // MessageBox.Show("Alt click logic is not yet implemented"); // do marker drag here } else if (ModifierKeys == Keys.Shift) @@ -1431,8 +1430,8 @@ namespace BizHawk.Client.EmuHawk if (!GlobalWin.MainForm.EmulatorPaused && _currentX.HasValue) { + // copypaste from OnMouseMove() Cell newCell = CalculatePointedCell(_currentX.Value, _currentY.Value); - // SuuperW: Hide lag frames if (QueryFrameLag != null && newCell.RowIndex.HasValue) { newCell.RowIndex += CountLagFramesDisplay(newCell.RowIndex.Value); @@ -1455,7 +1454,7 @@ namespace BizHawk.Client.EmuHawk Refresh(); } } - else if (_columnDown != null) // Kind of silly feeling to have this check twice, but the only alternative I can think of has it refreshing twice when pointed column changes with column down, and speed matters + else if (_columnDown != null) { Refresh(); } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs index 53b806b1cc..9ed99c4194 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs @@ -112,7 +112,7 @@ namespace BizHawk.Client.EmuHawk private void MaybeFollowCursor() { - if (TasPlaybackBox.FollowCursor && !mouseButtonHeld) + if (TasPlaybackBox.FollowCursor) SetVisibleIndex(); } } diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs index efaa92d08f..8190d6afdc 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs @@ -777,13 +777,13 @@ namespace BizHawk.Client.EmuHawk } else { - // feos: if we disable autorestore, we shouldn't ever get it paused - // moreover, this function is only called if we *were* paused, so the check makes no sense - //if (_autoRestorePaused.HasValue && !_autoRestorePaused.Value) - // GlobalWin.MainForm.UnpauseEmulator(); + if (_autoRestorePaused.HasValue && !_autoRestorePaused.Value) + { + // this happens when we're holding the left button while unpaused - view scrolls down, new input gets drawn, seek pauses + IgnoreSeekFrame = true; + GlobalWin.MainForm.UnpauseEmulator(); + } _autoRestorePaused = null; - // feos: seek gets triggered by the previous function, so we don't wanna kill the seek frame before it ends - //GlobalWin.MainForm.PauseOnFrame = null; // Cancel seek to autorestore point } _autoRestoreFrame = null; }