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

Move back to DI-ing adjustable clock into SummaryTimeline

Browse Source
This commit is contained in:
smoogipoo 2018-04-12 13:37:02 +09:00
parent fbc50d6030
commit a2484fbf56
3 changed files with 3 additions and 10 deletions
osu.Game.Tests/Visual
TestCaseEditorSummaryTimeline.cs
osu.Game/Screens/Edit
Components/Timelines/Summary
SummaryTimeline.cs
Editor.cs

2
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,

9
osu.Game/Screens/Edit/Components/Timelines/Summary/SummaryTimeline.cs

@ -17,15 +17,8 @@ namespace osu.Game.Screens.Edit.Components.Timelines.Summary
/// </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;

2
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,
},