Fix post-rebase issues

This commit is contained in:
smoogipoo
2018-11-12 17:36:19 +09:00
parent 10543cf1b6
commit d8e7ad8241
5 changed files with 17 additions and 17 deletions

View File

@ -61,7 +61,7 @@ namespace osu.Game.Rulesets.UI.Scrolling
MaxValue = time_span_max
};
protected virtual ScrollAlgorithm ScrollAlgorithm => ScrollAlgorithm.Sequential;
protected virtual ScrollVisualisationMethod VisualisationMethod => ScrollVisualisationMethod.Sequential;
/// <summary>
/// Whether the player can change <see cref="VisibleTimeRange"/>.
@ -87,15 +87,15 @@ namespace osu.Game.Rulesets.UI.Scrolling
scrollingInfo.Direction.BindTo(Direction);
scrollingInfo.TimeRange.BindTo(TimeRange);
switch (ScrollAlgorithm)
switch (VisualisationMethod)
{
case ScrollAlgorithm.Sequential:
case ScrollVisualisationMethod.Sequential:
scrollingInfo.Algorithm = new SequentialScrollAlgorithm(controlPoints);
break;
case ScrollAlgorithm.Overlapping:
case ScrollVisualisationMethod.Overlapping:
scrollingInfo.Algorithm = new OverlappingScrollAlgorithm(controlPoints);
break;
case ScrollAlgorithm.Constant:
case ScrollVisualisationMethod.Constant:
scrollingInfo.Algorithm = new ConstantScrollAlgorithm();
break;
}