RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move back to DI-ing adjustable clock into SummaryTimeline

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Visual/TestCaseEditorSummaryTimeline.cs
View File

@ -24,7 +24,7 @@ private void load(OsuGameBase osuGame)
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
View File

@ -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
View File

@ -129,7 +129,7 @@ private void load(OsuColour colours)
Padding = new MarginPadding { Right = 10 },
Child = timeInfo = new TimeInfoContainer { RelativeSizeAxes = Axes.Both },
},
timeline = new SummaryTimeline(clock)
timeline = new SummaryTimeline
{
RelativeSizeAxes = Axes.Both,
},