From c2eb32c0e9337149858613d40b9668fc83163641 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Tue, 20 Mar 2018 20:10:27 +0900 Subject: [PATCH] DrawableBeatDivisor -> BeatDivisorControl --- ...seDrawableBeatDivisor.cs => TestCaseBeatDivisorControl.cs} | 4 ++-- osu.Game.Tests/osu.Game.Tests.csproj | 2 +- .../Compose/{DrawableBeatDivisor.cs => BeatDivisorControl.cs} | 4 ++-- osu.Game/Screens/Edit/Screens/Compose/Compose.cs | 2 +- osu.Game/osu.Game.csproj | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename osu.Game.Tests/Visual/{TestCaseDrawableBeatDivisor.cs => TestCaseBeatDivisorControl.cs} (82%) rename osu.Game/Screens/Edit/Screens/Compose/{DrawableBeatDivisor.cs => BeatDivisorControl.cs} (96%) diff --git a/osu.Game.Tests/Visual/TestCaseDrawableBeatDivisor.cs b/osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs similarity index 82% rename from osu.Game.Tests/Visual/TestCaseDrawableBeatDivisor.cs rename to osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs index fa565eaf5d..598c504ca1 100644 --- a/osu.Game.Tests/Visual/TestCaseDrawableBeatDivisor.cs +++ b/osu.Game.Tests/Visual/TestCaseBeatDivisorControl.cs @@ -10,14 +10,14 @@ using OpenTK; namespace osu.Game.Tests.Visual { - public class TestCaseDrawableBeatDivisor : OsuTestCase + public class TestCaseBeatDivisorControl : OsuTestCase { public override IReadOnlyList RequiredTypes => new[] { typeof(BindableBeatDivisor) }; [BackgroundDependencyLoader] private void load() { - Child = new DrawableBeatDivisor(new BindableBeatDivisor()) + Child = new BeatDivisorControl(new BindableBeatDivisor()) { Anchor = Anchor.Centre, Origin = Anchor.Centre, diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index b5ab229f8a..e85bbd6f10 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -116,7 +116,7 @@ - + diff --git a/osu.Game/Screens/Edit/Screens/Compose/DrawableBeatDivisor.cs b/osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs similarity index 96% rename from osu.Game/Screens/Edit/Screens/Compose/DrawableBeatDivisor.cs rename to osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs index 35bb93cd4b..98b6a14219 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/DrawableBeatDivisor.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/BeatDivisorControl.cs @@ -16,13 +16,13 @@ using OpenTK.Graphics; 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); } diff --git a/osu.Game/Screens/Edit/Screens/Compose/Compose.cs b/osu.Game/Screens/Edit/Screens/Compose/Compose.cs index 2603832437..91adc8324a 100644 --- a/osu.Game/Screens/Edit/Screens/Compose/Compose.cs +++ b/osu.Game/Screens/Edit/Screens/Compose/Compose.cs @@ -70,7 +70,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose 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[] diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index 42f58e9eee..62a26334cc 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -381,7 +381,7 @@ - +