Merge branch 'FixedTimlineZoomAndAutoZoom' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-FixedTimlineZoomAndAutoZoom

This commit is contained in:
Wojtek Figat
2026-03-24 18:35:23 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -2148,10 +2148,9 @@ namespace FlaxEditor.GUI.Timeline
/// </summary>
public void ShowWholeTimeline()
{
var viewWidth = Width;
var timelineWidth = Duration * UnitsPerSecond * Zoom + 8 * StartOffset;
_backgroundArea.ViewOffset = Float2.Zero;
Zoom = viewWidth / timelineWidth;
const float padding = 40f;
Zoom = (_backgroundArea.Width - padding * 2f) / (Duration * UnitsPerSecond);
_backgroundArea.ViewOffset = new Float2(-_leftEdge.X + padding, _backgroundArea.ViewOffset.Y);
}
/// <summary>

View File

@@ -455,6 +455,7 @@ namespace FlaxEditor.Windows.Assets
_timeline.Enabled = true;
_timeline.SetNoTracksText(null);
ClearEditedFlag();
_timeline.ShowWholeTimeline();
}
}