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

DrawableBeatDivisor -> BeatDivisorControl

This commit is contained in:
Dean Herbert 2018-03-20 20:10:27 +09:00
parent 6fd650777c
commit c2eb32c0e9
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/Visual/TestCaseDrawableBeatDivisor.cs → osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs
View File

@ -10,14 +10,14 @@
namespace osu.Game.Tests.Visual
{
public class TestCaseDrawableBeatDivisor : OsuTestCase
public class TestCaseBeatDivisorControl : OsuTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(BindableBeatDivisor) };
[BackgroundDependencyLoader]
private void load()
{
Child = new DrawableBeatDivisor(new BindableBeatDivisor())
Child = new BeatDivisorControl(new BindableBeatDivisor())
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,

2
osu.Game.Tests/osu.Game.Tests.csproj
View File

@ -116,7 +116,7 @@
<Compile Include="Visual\TestCaseBeatmapOptionsOverlay.cs" />
<Compile Include="Visual\TestCaseBeatmapScoresContainer.cs" />
<Compile Include="Visual\TestCaseBeatmapSetOverlay.cs" />
<Compile Include="Visual\TestCaseDrawableBeatDivisor.cs" />
<Compile Include="Visual\TestCaseBeatDivisorControl.cs" />
<Compile Include="Visual\TestCaseBeatSyncedContainer.cs" />
<Compile Include="Visual\TestCaseBreadcrumbs.cs" />
<Compile Include="Visual\TestCaseBreakOverlay.cs" />

4
osu.Game/Screens/Edit/Screens/Compose/DrawableBeatDivisor.cs → osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs
View File

@ -16,13 +16,13 @@
namespace osu.Game.Screens.Edit.Screens.Compose
{
public class DrawableBeatDivisor : CompositeDrawable
public class BeatDivisorControl : CompositeDrawable
{
private readonly BindableBeatDivisor beatDivisor = new BindableBeatDivisor();
private int currentDivisorIndex;
private TickSliderBar slider;
public DrawableBeatDivisor(BindableBeatDivisor beatDivisor)
public BeatDivisorControl(BindableBeatDivisor beatDivisor)
{
this.beatDivisor.BindTo(beatDivisor);
}

2
osu.Game/Screens/Edit/Screens/Compose/Compose.cs
View File

@ -70,7 +70,7 @@ private void load()
Padding = new MarginPadding { Right = 5 },
Child = timeline = new ScrollableTimeline { RelativeSizeAxes = Axes.Both }
},
new DrawableBeatDivisor(beatDivisor) { RelativeSizeAxes = Axes.Both }
new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
},
},
ColumnDimensions = new[]

2
osu.Game/osu.Game.csproj
View File

@ -381,7 +381,7 @@
<Compile Include="Rulesets\Scoring\Legacy\LegacyScoreParser.cs" />
<Compile Include="Rulesets\UI\JudgementContainer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\BindableBeatDivisor.cs" />
<Compile Include="Screens\Edit\Screens\Compose\DrawableBeatDivisor.cs" />
<Compile Include="Screens\Edit\Screens\Compose\BeatDivisorControl.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Layers\BorderLayer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Layers\HitObjectMaskLayer.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Layers\SelectionBox.cs" />