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

Tastudio - remember the "Bind Markers to input" settings as a tastudio setting

This commit is contained in:
adelikat 2020-02-01 16:21:38 -06:00
parent e7399a5e10
commit 58ff3fa60d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1017,7 +1017,7 @@ namespace BizHawk.Client.EmuHawk
private void BindMarkersToInputMenuItem_Click(object sender, EventArgs e) private void BindMarkersToInputMenuItem_Click(object sender, EventArgs e)
{ {
CurrentTasMovie.BindMarkersToInput = BindMarkersToInputMenuItem.Checked; Settings.BindMarkersToInput = CurrentTasMovie.BindMarkersToInput = BindMarkersToInputMenuItem.Checked;
} }
private void EmptyNewMarkerNotesMenuItem_Click(object sender, EventArgs e) private void EmptyNewMarkerNotesMenuItem_Click(object sender, EventArgs e)

6
BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
View File

@ -105,6 +105,7 @@ namespace BizHawk.Client.EmuHawk
public bool DenoteMarkersWithBGColor { get; set; } public bool DenoteMarkersWithBGColor { get; set; }
public int MainVerticalSplitDistance { get; set; } public int MainVerticalSplitDistance { get; set; }
public int BranchMarkerSplitDistance { get; set; } public int BranchMarkerSplitDistance { get; set; }
public bool BindMarkersToInput { get; set; }
} }
#region Initializing #region Initializing
@ -311,6 +312,7 @@ namespace BizHawk.Client.EmuHawk
} }
TasView.Font = TasViewFont; TasView.Font = TasViewFont;
CurrentTasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
RefreshDialog(); RefreshDialog();
_initialized = true; _initialized = true;
} }
@ -561,6 +563,7 @@ namespace BizHawk.Client.EmuHawk
TasMovie newMovie = new TasMovie(startsFromSavestate: startsFromSavestate); TasMovie newMovie = new TasMovie(startsFromSavestate: startsFromSavestate);
newMovie.TasStateManager.InvalidateCallback = GreenzoneInvalidated; newMovie.TasStateManager.InvalidateCallback = GreenzoneInvalidated;
newMovie.Filename = file.FullName; newMovie.Filename = file.FullName;
newMovie.BindMarkersToInput = Settings.BindMarkersToInput;
BookMarkControl.LoadedCallback = BranchLoaded; BookMarkControl.LoadedCallback = BranchLoaded;
BookMarkControl.SavedCallback = BranchSaved; BookMarkControl.SavedCallback = BranchSaved;
@ -613,8 +616,9 @@ namespace BizHawk.Client.EmuHawk
if (AskSaveChanges()) if (AskSaveChanges())
{ {
Global.MovieSession.Movie = new TasMovie(); Global.MovieSession.Movie = new TasMovie();
var stateManager = ((TasMovie)Global.MovieSession.Movie).TasStateManager; CurrentTasMovie.BindMarkersToInput = Settings.BindMarkersToInput;
var stateManager = ((TasMovie)Global.MovieSession.Movie).TasStateManager;
stateManager.InvalidateCallback = GreenzoneInvalidated; stateManager.InvalidateCallback = GreenzoneInvalidated;
BookMarkControl.LoadedCallback = BranchLoaded; BookMarkControl.LoadedCallback = BranchLoaded;