Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity

fix rare bug where tracks pannel wouldn't scroll all the way through

Browse Source
This commit is contained in:
Saas
2026-03-19 20:47:34 +01:00
parent 65b35a4b8a
commit a831e15bf7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Editor/GUI/Timeline/Timeline.cs
+10 -6
View File
@@ -229,7 +229,7 @@ namespace FlaxEditor.GUI.Timeline
private List<Track> _mediaMoveStartTracks;
private byte[][] _mediaMoveStartData;
private float _zoom = 1.0f;
private float _tracksVScrollTarget = 0f;
private float _tracksVScrollTarget;
private bool _isMovingPositionHandle;
private bool _canPlayPause = true, _canStop = true;
private List<IUndoAction> _batchedUndoActions;
@@ -899,8 +899,6 @@ namespace FlaxEditor.GUI.Timeline
};
UpdatePositionHandle();
PlaybackState = PlaybackStates.Disabled;
_tracksVScrollTarget = _tracksPanelArea.VScrollBar.TargetValue;
}
private void UpdatePositionHandle()
@@ -2042,14 +2040,20 @@ namespace FlaxEditor.GUI.Timeline
// Synchronize scroll vertical bars for tracks and media panels to keep the view in sync
var tracksVScroll = _tracksPanelArea.VScrollBar;
var backgroundVScroll = _backgroundArea.VScrollBar;
bool forceBackgroundToTracksScroll = !Mathf.WithinEpsilon(_tracksVScrollTarget - tracksVScroll.Value, 0f, 5f);
if (tracksVScroll.IsThumbClicked || _tracksPanelArea.IsMouseOver || forceBackgroundToTracksScroll)
bool forceBackgroundToTracksScroll = _tracksVScrollTarget > 0;
if (forceBackgroundToTracksScroll)
{
backgroundVScroll.TargetValue = tracksVScroll.Value;
if (Mathf.Abs(tracksVScroll.Value - _tracksVScrollTarget) < 0.5f)
_tracksVScrollTarget = 0f;
}
else if (tracksVScroll.IsThumbClicked || _tracksPanelArea.IsMouseOver)
{
backgroundVScroll.TargetValue = tracksVScroll.Value;
}
else
{
_tracksVScrollTarget = 0f;
tracksVScroll.TargetValue = backgroundVScroll.Value;
}