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

tastudio: 

- preserve branch text per update (unless default text has changed)
- remove redundant code from paste functions, rely on global clipboard fully with cut/copy too
This commit is contained in:
feos 2016-10-10 19:00:59 +03:00
parent 93f78a69d2
commit 9714aa5cc9
2 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/movie/tasproj/TasMovie.cs
View File

@ -585,6 +585,8 @@ namespace BizHawk.Client.Common
{
int index = Branches.IndexOf(old);
newBranch.UniqueIdentifier = old.UniqueIdentifier;
if (newBranch.UserText == "")
newBranch.UserText = old.UserText;
Branches[index] = newBranch;
TasStateManager.UpdateBranch(index);
Changes = true;

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

@ -363,7 +363,7 @@ namespace BizHawk.Client.EmuHawk
{
if (TasView.AnyRowsSelected)
{
_tasClipboard.Clear();
//_tasClipboard.Clear();
var list = TasView.SelectedRows.ToList();
var sb = new StringBuilder();
@ -372,7 +372,7 @@ namespace BizHawk.Client.EmuHawk
var input = CurrentTasMovie.GetInputState(index);
if (input == null)
break;
_tasClipboard.Add(new TasClipboardEntry(index, input));
//_tasClipboard.Add(new TasClipboardEntry(index, input));
var lg = CurrentTasMovie.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());
@ -431,29 +431,6 @@ namespace BizHawk.Client.EmuHawk
}
}
}
else if (_tasClipboard.Any())
{
var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
CurrentTasMovie.CopyOverInput(TasView.FirstSelectedIndex.Value, _tasClipboard.Select(x => x.ControllerState));
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(TasView.FirstSelectedIndex.Value);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
}
else
{
RefreshDialog();
}
}
}
private void PasteInsertMenuItem_Click(object sender, EventArgs e)
@ -501,29 +478,6 @@ namespace BizHawk.Client.EmuHawk
}
}
}
else if (_tasClipboard.Any())
{
var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
CurrentTasMovie.InsertInput(TasView.FirstSelectedIndex.Value, _tasClipboard.Select(x => x.ControllerState));
if (needsToRollback)
{
GoToLastEmulatedFrameIfNecessary(TasView.FirstSelectedIndex.Value);
if (wasPaused)
{
DoAutoRestore();
}
else
{
Mainform.UnpauseEmulator();
}
}
else
{
RefreshDialog();
}
}
}
private void CutMenuItem_Click(object sender, EventArgs e)
@ -534,7 +488,7 @@ namespace BizHawk.Client.EmuHawk
var needsToRollback = TasView.FirstSelectedIndex < Emulator.Frame;
var rollBackFrame = TasView.FirstSelectedIndex.Value;
_tasClipboard.Clear();
//_tasClipboard.Clear();
var list = TasView.SelectedRows.ToArray();
var sb = new StringBuilder();
@ -543,7 +497,7 @@ namespace BizHawk.Client.EmuHawk
var input = CurrentTasMovie.GetInputState(index);
if (input == null)
break;
_tasClipboard.Add(new TasClipboardEntry(index, input));
//_tasClipboard.Add(new TasClipboardEntry(index, input));
var lg = CurrentTasMovie.LogGeneratorInstance();
lg.SetSource(input);
sb.AppendLine(lg.GenerateLogEntry());