From 03dbcc36077f7945804ba0bfae5de40dc76fe001 Mon Sep 17 00:00:00 2001 From: adelikat Date: Fri, 13 Dec 2019 18:29:30 -0600 Subject: [PATCH] Tastudio - tweak follow cursor logic in horizontal orientation --- .../CustomControls/InputRoll/InputRoll.cs | 22 +++++++++++++++---- .../tools/TAStudio/TAStudio.Navigation.cs | 2 ++ 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index 768bebaf94..42bcdca05f 100644 --- a/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -736,9 +736,16 @@ namespace BizHawk.Client.EmuHawk get { int halfRow = 0; - if ((_drawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2) + if (HorizontalOrientation) { - halfRow = 1; + halfRow = 1; // TODO: A more precise calculation, but it really isn't important, you have to be pixel perfect for this to be off by 1 and even then it doesn't look bad because the 1 pixel is the border + } + else + { + if ((_drawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2) + { + halfRow = 1; + } } return FirstVisibleRow + VisibleRows - halfRow + CountLagFramesDisplay(VisibleRows - halfRow); @@ -751,9 +758,16 @@ namespace BizHawk.Client.EmuHawk set { int halfRow = 0; - if ((_drawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2) + if (HorizontalOrientation) { - halfRow = 1; + halfRow = 1; // TODO: A more precise calculation, but it really isn't important, you have to be pixel perfect for this to be off by 1 and even then it doesn't look bad because the 1 pixel is the border + } + else + { + if ((_drawHeight - ColumnHeight - 3) % CellHeight < CellHeight / 2) + { + halfRow = 1; + } } if (LagFramesToHide == 0) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs index 6f99a56731..8cee89a134 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs @@ -98,7 +98,9 @@ public void SetVisibleIndex(int? indexThatMustBeVisible = null) { if (TasView.AlwaysScroll && _leftButtonHeld) + { return; + } if (!indexThatMustBeVisible.HasValue) {