GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add timeline undo actions batching

Browse Source
This commit is contained in:
Wojtek Figat
2021-08-25 10:04:29 +02:00
parent aa75a2aeb0
commit 2beb0e137b
6 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Editor/GUI/Timeline/Timeline.cs
View File

@@ -309,6 +309,7 @@ namespace FlaxEditor.GUI.Timeline
private float _zoom = 1.0f;
private bool _isMovingPositionHandle;
private bool _canPlayPauseStop = true;
private List<IUndoAction> _batchedUndoActions;
/// <summary>
/// Gets or sets the current time showing mode.
@@ -1986,6 +1987,19 @@ namespace FlaxEditor.GUI.Timeline
}
}
/// <summary>
/// Adds the undo action to be batched (eg. if multiple undo actions is performed in a sequence during single update).
/// </summary>
/// <param name="action">The action.</param>
public void AddBatchedUndoAction(IUndoAction action)
{
if (Undo == null || !Undo.Enabled)
return;
if (_batchedUndoActions == null)
_batchedUndoActions = new List<IUndoAction>();
_batchedUndoActions.Add(action);
}
internal void ShowContextMenu(Vector2 location)
{
if (!ContainsFocus)
@@ -2038,6 +2052,13 @@ namespace FlaxEditor.GUI.Timeline
scroll2.TargetValue = scroll1.Value;
else
scroll1.TargetValue = scroll2.Value;
// Batch undo actions
if (_batchedUndoActions != null && _batchedUndoActions.Count != 0)
{
Undo.AddAction(_batchedUndoActions.Count == 1 ? _batchedUndoActions[0] : new MultiUndoAction(_batchedUndoActions));
_batchedUndoActions.Clear();
}
}
/// <inheritdoc />

2
Source/Editor/GUI/Timeline/Tracks/AudioTrack.cs
View File

@@ -520,7 +520,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
var after = EditTrackAction.CaptureData(this);
if (!Utils.ArraysEqual(_curveEditingStartData, after))
Timeline.Undo.AddAction(new EditTrackAction(Timeline, this, _curveEditingStartData, after));
Timeline.AddBatchedUndoAction(new EditTrackAction(Timeline, this, _curveEditingStartData, after));
_curveEditingStartData = null;
}

2
Source/Editor/GUI/Timeline/Tracks/CurvePropertyTrack.cs
View File

@@ -271,7 +271,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
var after = EditTrackAction.CaptureData(this);
if (!Utils.ArraysEqual(_curveEditingStartData, after))
Timeline.Undo.AddAction(new EditTrackAction(Timeline, this, _curveEditingStartData, after));
Timeline.AddBatchedUndoAction(new EditTrackAction(Timeline, this, _curveEditingStartData, after));
_curveEditingStartData = null;
}

2
Source/Editor/GUI/Timeline/Tracks/EventTrack.cs
View File

@@ -311,7 +311,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
var after = EditTrackAction.CaptureData(this);
if (!Utils.ArraysEqual(_eventsEditingStartData, after))
Timeline.Undo.AddAction(new EditTrackAction(Timeline, this, _eventsEditingStartData, after));
Timeline.AddBatchedUndoAction(new EditTrackAction(Timeline, this, _eventsEditingStartData, after));
_eventsEditingStartData = null;
}

2
Source/Editor/GUI/Timeline/Tracks/KeyframesPropertyTrack.cs
View File

@@ -278,7 +278,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
var after = EditTrackAction.CaptureData(this);
if (!Utils.ArraysEqual(_keyframesEditingStartData, after))
Timeline.Undo.AddAction(new EditTrackAction(Timeline, this, _keyframesEditingStartData, after));
Timeline.AddBatchedUndoAction(new EditTrackAction(Timeline, this, _keyframesEditingStartData, after));
_keyframesEditingStartData = null;
}

2
Source/Editor/GUI/Timeline/Tracks/ScreenFadeTrack.cs
View File

@@ -72,7 +72,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
{
var after = EditTrackAction.CaptureData(Track);
if (!Utils.ArraysEqual(_gradientEditingStartData, after))
Timeline.Undo.AddAction(new EditTrackAction(Timeline, Track, _gradientEditingStartData, after));
Timeline.AddBatchedUndoAction(new EditTrackAction(Timeline, Track, _gradientEditingStartData, after));
_gradientEditingStartData = null;
}