From a2484fbf56b316dea4cf5ddc716410432c4f5216 Mon Sep 17 00:00:00 2001 From: smoogipoo Date: Thu, 12 Apr 2018 13:37:02 +0900 Subject: [PATCH] Move back to DI-ing adjustable clock into SummaryTimeline --- osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs | 2 +- .../Edit/Components/Timelines/Summary/SummaryTimeline.cs | 9 +-------- osu.Game/Screens/Edit/Editor.cs | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs b/osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs index 13e7fb8c7d..25ea3443ba 100644 --- a/osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs +++ b/osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs @@ -24,7 +24,7 @@ namespace osu.Game.Tests.Visual osuGame.Beatmap.Value = new TestWorkingBeatmap(new OsuRuleset().RulesetInfo); SummaryTimeline summaryTimeline; - Add(summaryTimeline = new SummaryTimeline(Clock) + Add(summaryTimeline = new SummaryTimeline { Anchor = Anchor.Centre, Origin = Anchor.Centre, diff --git a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs index b368b92e42..0e80c13257 100644 --- a/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs +++ b/osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs @@ -17,15 +17,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary /// public class SummaryTimeline : BottomBarContainer { - private readonly IAdjustableClock adjustableClock; - - public SummaryTimeline(IAdjustableClock adjustableClock) - { - this.adjustableClock = adjustableClock; - } - [BackgroundDependencyLoader] - private void load(OsuColour colours) + private void load(OsuColour colours, IAdjustableClock adjustableClock) { TimelinePart markerPart, controlPointPart, bookmarkPart, breakPart; diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs index d63ee3fe75..e6edc9a6ff 100644 --- a/osu.Game/Screens/Edit/Editor.cs +++ b/osu.Game/Screens/Edit/Editor.cs @@ -129,7 +129,7 @@ namespace osu.Game.Screens.Edit Padding = new MarginPadding { Right = 10 }, Child = timeInfo = new TimeInfoContainer { RelativeSizeAxes = Axes.Both }, }, - timeline = new SummaryTimeline(clock) + timeline = new SummaryTimeline { RelativeSizeAxes = Axes.Both, },