ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tastudio a few simplifications

This commit is contained in:
adelikat 2020-05-01 09:52:25 -05:00
parent 67a832d79a
commit d1cb8d53ad
4 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/tools/TAStudio/MarkerControl.cs
View File

@ -101,7 +101,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (MarkerView.AnyRowsSelected) if (MarkerView.AnyRowsSelected)
{ {
Tastudio.SetVisibleIndex(SelectedMarkerFrame()); Tastudio.SetVisibleFrame(SelectedMarkerFrame());
Tastudio.RefreshDialog(); Tastudio.RefreshDialog();
} }
} }

2
BizHawk.Client.EmuHawk/tools/TAStudio/PlaybackBox.cs
View File

@ -118,7 +118,7 @@ namespace BizHawk.Client.EmuHawk
if (Tastudio.Settings.FollowCursor) if (Tastudio.Settings.FollowCursor)
{ {
Tastudio.SetVisibleIndex(); Tastudio.SetVisibleFrame();
Tastudio.RefreshDialog(); Tastudio.RefreshDialog();
} }
} }

2
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.IToolForm.cs
View File

@ -45,7 +45,7 @@ namespace BizHawk.Client.EmuHawk
return; return;
} }
bool refreshNeeded = false; var refreshNeeded = false;
if (AutoadjustInputMenuItem.Checked) if (AutoadjustInputMenuItem.Checked)
{ {
refreshNeeded = AutoAdjustInput(); refreshNeeded = AutoAdjustInput();

11
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.Navigation.cs
View File

@ -97,26 +97,21 @@ namespace BizHawk.Client.EmuHawk
/// <summary> /// <summary>
/// Makes the given frame visible. If no frame is given, makes the current frame visible. /// Makes the given frame visible. If no frame is given, makes the current frame visible.
/// </summary> /// </summary>
public void SetVisibleIndex(int? indexThatMustBeVisible = null) public void SetVisibleFrame(int? frame = null)
{ {
if (TasView.AlwaysScroll && _leftButtonHeld) if (TasView.AlwaysScroll && _leftButtonHeld)
{ {
return; return;
} }
if (!indexThatMustBeVisible.HasValue) TasView.ScrollToIndex(frame ?? Emulator.Frame);
{
indexThatMustBeVisible = Emulator.Frame;
}
TasView.ScrollToIndex(indexThatMustBeVisible.Value);
} }
private void MaybeFollowCursor() private void MaybeFollowCursor()
{ {
if (TasPlaybackBox.FollowCursor) if (TasPlaybackBox.FollowCursor)
{ {
SetVisibleIndex(); SetVisibleFrame();
} }
} }
} }