h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 20:52:54 +08:00
Code Issues Releases Wiki Activity

Expose EditorClock for consumption

Browse Source
This commit is contained in:
Dean Herbert 2020-11-26 19:20:39 +09:00
parent 9811c46e35
commit 91592cf32d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Screens/Edit/Compose/Components/BlueprintContainer.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
private IEditorChangeHandler changeHandler { get; set; } private IEditorChangeHandler changeHandler { get; set; }
[Resolved] [Resolved]
private EditorClock editorClock { get; set; } protected EditorClock EditorClock { get; private set; }
[Resolved] [Resolved]
protected EditorBeatmap Beatmap { get; private set; } protected EditorBeatmap Beatmap { get; private set; }
@ -170,7 +170,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint) if (clickedBlueprint == null || SelectionHandler.SelectedBlueprints.FirstOrDefault(b => b.IsHovered) != clickedBlueprint)
return false; return false;
editorClock?.SeekTo(clickedBlueprint.HitObject.StartTime); EditorClock?.SeekTo(clickedBlueprint.HitObject.StartTime);
return true; return true;
} }
@ -381,7 +381,7 @@ namespace osu.Game.Screens.Edit.Compose.Components
case SelectionState.Selected: case SelectionState.Selected:
// if the editor is playing, we generally don't want to deselect objects even if outside the selection area. // if the editor is playing, we generally don't want to deselect objects even if outside the selection area.
if (!editorClock.IsRunning && !isValidForSelection()) if (!EditorClock.IsRunning && !isValidForSelection())
blueprint.Deselect(); blueprint.Deselect();
break; break;
} }