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

tastudio: update RowCount before scrolling to frame. 

fixes loading a branch whose movie length is longer than current.
This commit is contained in:
feos 2015-10-25 20:24:33 +03:00
parent 19add0ec93
commit a4b3a57af2
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
View File

@ -743,7 +743,9 @@ namespace BizHawk.Client.EmuHawk
return (index >= FirstVisibleRow) && (index <= LastFullyVisibleRow); return (index >= FirstVisibleRow) && (index <= LastFullyVisibleRow);
} }
public bool IsPartiallyVisible(int index) public bool IsPartiallyVisible(int index)
{ return (index >= FirstVisibleRow) && (index <= LastVisibleRow); } {
return (index >= FirstVisibleRow) && (index <= LastVisibleRow);
}
/// <summary> /// <summary>
/// Gets the number of rows currently visible including partially visible rows. /// Gets the number of rows currently visible including partially visible rows.

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

@ -145,7 +145,7 @@ namespace BizHawk.Client.EmuHawk
if (SelectedBranch != null) if (SelectedBranch != null)
{ {
int index = BranchView.SelectedRows.First(); int index = BranchView.SelectedRows.First();
//if (Movie.CurrentBranchCurrentBranch == index) // if the current branch was edited, we should allow loading it. some day there might be a proper check //if (Movie.CurrentBranch == index) // if the current branch was edited, we should allow loading it. some day there might be a proper check
// return; // return;
Movie.CurrentBranch = index; Movie.CurrentBranch = index;
LoadBranch(SelectedBranch); LoadBranch(SelectedBranch);

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

@ -39,14 +39,15 @@ namespace BizHawk.Client.EmuHawk
if (AutoadjustInputMenuItem.Checked) if (AutoadjustInputMenuItem.Checked)
refreshNeeded = AutoAdjustInput(); refreshNeeded = AutoAdjustInput();
if (TasView.RowCount != CurrentTasMovie.InputLogLength + 1)
TasView.RowCount = CurrentTasMovie.InputLogLength + 1;
MaybeFollowCursor(); MaybeFollowCursor();
if (TasView.IsPartiallyVisible(Global.Emulator.Frame) || TasView.IsPartiallyVisible(lastRefresh)) if (TasView.IsPartiallyVisible(Global.Emulator.Frame) || TasView.IsPartiallyVisible(lastRefresh))
refreshNeeded = true; refreshNeeded = true;
RefreshDialog(refreshNeeded); RefreshDialog(refreshNeeded);
if (!refreshNeeded && TasView.RowCount != CurrentTasMovie.InputLogLength + 1) // Perhaps not the best place to put this.
TasView.RowCount = CurrentTasMovie.InputLogLength + 1;
} }
public void FastUpdate() public void FastUpdate()