Merge branch 'master' into beatmap-track-rework

This commit is contained in:
Dean Herbert
2020-09-02 15:24:46 +09:00
committed by GitHub
11 changed files with 52 additions and 10 deletions

View File

@ -91,7 +91,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
}, true);
}
private float getZoomLevelForVisibleMilliseconds(double milliseconds) => (float)(track.Length / milliseconds);
private float getZoomLevelForVisibleMilliseconds(double milliseconds) => Math.Max(1, (float)(track.Length / milliseconds));
protected override void Update()
{