Merge pull request #1106 from andy840119/editor-screen-should-have-it…

…s-own-editor-click Editor screen should have its own editor click.
karaoke-dev · Feb 7, 2022 · 54fc5a6 · 54fc5a6
2 parents 77adac0 + 61e1780
commit 54fc5a6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneKaraokeEditor.cs b/osu.Game.Rulesets.Karaoke.Tests/Editor/TestSceneKaraokeEditor.cs
@@ -54,8 +54,6 @@ private void load()
 
             Dependencies.Cache(dialogOverlay);
             Dependencies.Cache(lyricCheckerManager);
-
-            Dependencies.Cache(new EditorClock());
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Screens/TestSceneKaraokeSkinEditor.cs b/osu.Game.Rulesets.Karaoke.Tests/Screens/TestSceneKaraokeSkinEditor.cs
@@ -28,9 +28,6 @@ public class TestSceneKaraokeSkinEditor : ScreenTestScene<KaraokeSkinEditor>
         [BackgroundDependencyLoader]
         private void load(SkinManager skinManager)
         {
-            // todo: karaoke skin editor might not need editor clock eventually?
-            Dependencies.Cache(new EditorClock());
-
             skinManager.CurrentSkinInfo.Value = DefaultKaraokeSkin.CreateInfo().ToLiveUnmanaged();
 
             karaokeSkin = skinManager.CurrentSkin.Value as KaraokeSkin;

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs
@@ -41,9 +41,23 @@ public abstract class GenericEditor<TScreenMode> : ScreenWithBeatmapBackground w
 
         private GenericEditorMenuBar<TScreenMode> menuBar;
 
+        private DependencyContainer dependencies;
+
+        protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnlyDependencyContainer parent)
+            => dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
+
         [BackgroundDependencyLoader(true)]
-        private void load(OsuColour colours, EditorBeatmap beatmap)
+        private void load(OsuColour colours, EditorBeatmap editorBeatmap, BindableBeatDivisor beatDivisor)
         {
+            // todo: should re-inject editor clock because it will let track cannot change time because it's in another screen.
+            var clock = new EditorClock(editorBeatmap, beatDivisor) { IsCoupled = false };
+
+            var loadableBeatmap = Beatmap.Value;
+            clock.ChangeSource(loadableBeatmap.Track);
+
+            dependencies.CacheAs(clock);
+            AddInternal(clock);
+
             AddInternal(new OsuContextMenuContainer
             {
                 RelativeSizeAxes = Axes.Both,