sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-03 20:57:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing dependency in ZoomableScrollContainer test

Browse Source
This commit is contained in:
Dean Herbert 2020-02-14 14:41:55 +09:00
parent 60d796ae3f
commit 0e439e3a70
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
View File

@ -32,7 +32,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
private float currentZoom = 1; private float currentZoom = 1;
[Resolved] [Resolved(canBeNull: true)]
private IFrameBasedClock editorClock { get; set; } private IFrameBasedClock editorClock { get; set; }
public ZoomableScrollContainer() public ZoomableScrollContainer()
@ -112,7 +112,7 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
{ {
// can't handle scroll correctly while playing. // can't handle scroll correctly while playing.
// the editor will handle this case for us. // the editor will handle this case for us.
if (editorClock.IsRunning) if (editorClock?.IsRunning == true)
return false; return false;
// for now, we don't support zoom when using a precision scroll device. this needs gesture support. // for now, we don't support zoom when using a precision scroll device. this needs gesture support.