tastudio:
- history form: canonical colors, show the current item better, report marker operations - markers: adding markers updates dialog, don't ever remove marker 0 - tsm: attempt to fix exception in AllLag()
This commit is contained in:
parent
e4a1a517cd
commit
1b8ef3738a
|
@ -283,6 +283,11 @@ namespace BizHawk.Client.Common
|
|||
{
|
||||
if (IsRecording || force)
|
||||
{
|
||||
if (oldPosition == -1)
|
||||
name = "Set Marker at frame " + newMarker.Frame;
|
||||
else
|
||||
name = "Remove Marker at frame " + oldPosition;
|
||||
|
||||
AddMovieAction(name);
|
||||
History.Last().Add(new MovieActionMarker(newMarker, oldPosition, old_message));
|
||||
}
|
||||
|
|
|
@ -169,7 +169,7 @@ namespace BizHawk.Client.Common
|
|||
|
||||
public new void Remove(TasMovieMarker item)
|
||||
{
|
||||
if (item == null) // TODO: Don't do this.
|
||||
if (item == null || item.Frame == 0) // TODO: Don't do this.
|
||||
return;
|
||||
_movie.ChangeLog.AddMarkerChange(null, item.Frame, item.Message);
|
||||
base.Remove(item);
|
||||
|
|
|
@ -320,7 +320,7 @@ namespace BizHawk.Client.Common
|
|||
|
||||
for (int i = from; i < upTo; i++)
|
||||
{
|
||||
if (!_movie[i].Lagged.Value)
|
||||
if (_movie[i].Lagged == null)
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -187,6 +187,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
Markers.Add(new TasMovieMarker(markerFrame, ""));
|
||||
UpdateValues();
|
||||
}
|
||||
Tastudio.RefreshDialog();
|
||||
}
|
||||
|
||||
public void EditMarkerPopUp(TasMovieMarker marker)
|
||||
|
|
|
@ -44,9 +44,9 @@ namespace BizHawk.Client.EmuHawk
|
|||
return;
|
||||
|
||||
if (row == log.UndoIndex)
|
||||
color = Color.Green;
|
||||
color = TAStudio.GreenZone_InputLog;
|
||||
else if (row > log.UndoIndex)
|
||||
color = Color.Red;
|
||||
color = TAStudio.LagZone_InputLog;
|
||||
}
|
||||
|
||||
private string _lastUndoAction = null;
|
||||
|
@ -55,7 +55,7 @@ namespace BizHawk.Client.EmuHawk
|
|||
HistoryView.ItemCount = log.Names.Count;
|
||||
if (AutoScrollCheck.Checked && _lastUndoAction != log.NextUndoStepName)
|
||||
{
|
||||
HistoryView.ensureVisible(log.UndoIndex - 1);
|
||||
HistoryView.ensureVisible(log.UndoIndex);
|
||||
HistoryView.clearSelection();
|
||||
HistoryView.SelectItem(log.UndoIndex - 1, true);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue